From patchwork Thu Dec 19 18:32:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 182168 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp859739iln; Thu, 19 Dec 2019 10:44:52 -0800 (PST) X-Google-Smtp-Source: APXvYqxRL0ObqHwHp0+8o+wz+DtVIrI8+NwbFzjPqbjBPWU4G4aE1eytlXDMY5ALlNT5EOXfkEzg X-Received: by 2002:a9d:6f0a:: with SMTP id n10mr10689940otq.54.1576781092658; Thu, 19 Dec 2019 10:44:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781092; cv=none; d=google.com; s=arc-20160816; b=tZqe7YC5xXJTlbCoIZdUhmCp5kp5y9DILBX2j/Zxn6DrowE3YzvU8Cqojhm8nI8Nlf HX6WJ6cFasNKrUtB04tSPncgWojU7adM1o4ikE0X4MYd9rc7ik3+bcovBj46AqdbMgUe 3Twni8gqemZ5gILLEd07EBJJO4CcyrGsW5qdvEdB79NMfaL1jNSsU2WvyQwMpnG0KVgx txQCbKMD+jGsyuOut3cp0V4hGn/wZwppP8I/sMYqwSMM3Jd/KOrVbuLPpyDKBDfFcIN8 2AmnpLsdmKiyo3j8CvmebS4ox/f7fz/F4EycZszBsnsgMsQakWQVunbD3TYWK0Fv2+82 VIJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6yDiT31pLTZA5bGI/hzkeEKXQ+0nYjgT2FHD22Vga7Y=; b=K5J5jGYnHJXskzZD+SEBgg+rD59tPCDH1gtuN3nC1Qs9WHms+5m8baOmGOoGknMzH0 S2wCLOW3xqgxQlWIqmpCDW6BV8xUdf/HOP6oPhUdB+5At6cFZ00/sWzwSGJ29NHqUuRP Z4tZTEUQ67ZiVkkfg52qk0J8nu0H9JoZYWkzvvptPGrKk2KiqOzr75+oK0xEh0WuXFmu iqSIt8o04JejL3N+Vl8w989sQYvxo6Wzqbv7Ig3jQDlh2zxU69f7AOqHQwjhJbhIt9cT hrFixdzFM47LEazyI80/ofOCzFVdiqY/e/1c2eRYA2A+2HkdSlVKOjO+OiAMgMA+7A/G izuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kvvfGzjD; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g16si3662061otj.129.2019.12.19.10.44.52; Thu, 19 Dec 2019 10:44:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kvvfGzjD; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728184AbfLSSou (ORCPT + 14 others); Thu, 19 Dec 2019 13:44:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:36916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729057AbfLSSos (ORCPT ); Thu, 19 Dec 2019 13:44:48 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F2E2424672; Thu, 19 Dec 2019 18:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781087; bh=cvPAg9I2YwVLNkWL6x0/cKoqr1AmKIBCDJShQFg1R7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvvfGzjDcAVAYEeLVESnRUxQP0WhRTwQZkzbCuBW+LpupRdlcHIqB4eqYvtRLt/PL hLdhFht7UnKnNkDZ/4LMDEPWMtH2hyVx4c062nxkyLiTKlcptiNQEG/scwm3nTWLD2 gycpKESXXSgRidWSYZkFXzji5R2SdEmGuTBLqzDk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leo Yan , Mathieu Poirier , Mike Leach Subject: [PATCH 4.9 076/199] coresight: etm4x: Fix input validation for sysfs. Date: Thu, 19 Dec 2019 19:32:38 +0100 Message-Id: <20191219183219.183611335@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183214.629503389@linuxfoundation.org> References: <20191219183214.629503389@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mike Leach commit 2fe6899e36aa174abefd017887f9cfe0cb60c43a upstream. A number of issues are fixed relating to sysfs input validation:- 1) bb_ctrl_store() - incorrect compare of bit select field to absolute value. Reworked per ETMv4 specification. 2) seq_event_store() - incorrect mask value - register has two event values. 3) cyc_threshold_store() - must mask with max before checking min otherwise wrapped values can set illegal value below min. 4) res_ctrl_store() - update to mask off all res0 bits. Reviewed-by: Leo Yan Reviewed-by: Mathieu Poirier Signed-off-by: Mike Leach Fixes: a77de2637c9eb ("coresight: etm4x: moving sysFS entries to a dedicated file") Cc: stable # 4.9+ Signed-off-by: Mathieu Poirier Link: https://lore.kernel.org/r/20191104181251.26732-6-mathieu.poirier@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/hwtracing/coresight/coresight-etm4x-sysfs.c | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) --- a/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-sysfs.c @@ -667,10 +667,13 @@ static ssize_t cyc_threshold_store(struc if (kstrtoul(buf, 16, &val)) return -EINVAL; + + /* mask off max threshold before checking min value */ + val &= ETM_CYC_THRESHOLD_MASK; if (val < drvdata->ccitmin) return -EINVAL; - config->ccctlr = val & ETM_CYC_THRESHOLD_MASK; + config->ccctlr = val; return size; } static DEVICE_ATTR_RW(cyc_threshold); @@ -701,14 +704,16 @@ static ssize_t bb_ctrl_store(struct devi return -EINVAL; if (!drvdata->nr_addr_cmp) return -EINVAL; + /* - * Bit[7:0] selects which address range comparator is used for - * branch broadcast control. + * Bit[8] controls include(1) / exclude(0), bits[0-7] select + * individual range comparators. If include then at least 1 + * range must be selected. */ - if (BMVAL(val, 0, 7) > drvdata->nr_addr_cmp) + if ((val & BIT(8)) && (BMVAL(val, 0, 7) == 0)) return -EINVAL; - config->bb_ctrl = val; + config->bb_ctrl = val & GENMASK(8, 0); return size; } static DEVICE_ATTR_RW(bb_ctrl); @@ -1341,8 +1346,8 @@ static ssize_t seq_event_store(struct de spin_lock(&drvdata->spinlock); idx = config->seq_idx; - /* RST, bits[7:0] */ - config->seq_ctrl[idx] = val & 0xFF; + /* Seq control has two masks B[15:8] F[7:0] */ + config->seq_ctrl[idx] = val & 0xFFFF; spin_unlock(&drvdata->spinlock); return size; } @@ -1597,7 +1602,7 @@ static ssize_t res_ctrl_store(struct dev if (idx % 2 != 0) /* PAIRINV, bit[21] */ val &= ~BIT(21); - config->res_ctrl[idx] = val; + config->res_ctrl[idx] = val & GENMASK(21, 0); spin_unlock(&drvdata->spinlock); return size; }