| Message ID | 20231201-mcp3564_range_checks-v1-1-68f4436e22b0@gmail.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp1000114vqy;
Fri, 1 Dec 2023 01:48:29 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IETVUGc7eIZOoqvvshnEhJ/KzdxWliFD8l4yAmK6L8t4HmgRjbvcm6fLYr48Su2sw7Qx9qB
X-Received: by 2002:a05:6a00:a0e:b0:6cb:cd3e:93c3 with SMTP id
p14-20020a056a000a0e00b006cbcd3e93c3mr29008673pfh.16.1701424109013;
Fri, 01 Dec 2023 01:48:29 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1701424109; cv=none;
d=google.com; s=arc-20160816;
b=wvLv74bYVfj9G27cQVMIyvu98BMWv4hm0ttMXR9ibJQ5ebw1AtMZOrpA0aN2CQQxfl
Qf4rlgJ1THD10c93pbn4Yb767kSu6C+16PaZstaUIYYkas37tS3VLpEjocLCozi+RVwl
BZgc190kThjy8qIkGMC+6MqwpYBUqqGs8GD3Gr57kdqTzMNhlciewfnHi+yzfIFq6FnD
6NizAeRQgIiJ+MGUOwvkAr4WBswMjEAK2XrO57Ll4PCNPqI6fZZSZMjBUOn+01QL0v9f
Rw5vjT+pBTlcjVXPFRgORKtYG5YAI4JCRx6mex74nLblk1jEJU1VOgB1TIO99bAF/Wyv
9h/Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:cc:to:message-id:content-transfer-encoding
:mime-version:subject:date:from:dkim-signature;
bh=Guu0Z50m2NZpOq4m9gWLYS84w8ajfYt4+lCW/K6tb6g=;
fh=heIDMdnJeb6pQwMFQ54ovvxNH6TrfHKezHioc2dZ+LA=;
b=RtGGx2Qb2T4+pxfYoBpYT4QW1NlyNc7SLZgFsH+SHKyqSKvPJSieP0+H0b/jfxc+GO
Tl/nbCIygWsa8GrJTgPs3OM62kuckepnPa06H2ibXDUh66k1ybn5gOxc8eNhsvFs20+F
y9OvmWd7MD3J/vs+Fq4Vu/9tPYySV5BfZsqDFgP9G+ZTFSgaTl+/0Jt6XmXkX/NR+LQN
/XUn8dha/SRkRmL5s0JDOAVywtXdYqdqNE7xYAEctJu6G8WzqQksN1jR8U2YdfT2D5mT
gJ94wQUVZp82Kc0lLLQf0JqjxKxNEDrkIXFx9PRBy/6ChyChiZBu2KdWcYN29JKr16HE
H7dQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@gmail.com header.s=20230601 header.b=RiVF9MGq;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Received: from pete.vger.email (pete.vger.email. [23.128.96.36])
by mx.google.com with ESMTPS id
do12-20020a056a004a0c00b006cd989cfe42si2861454pfb.7.2023.12.01.01.48.28
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 01 Dec 2023 01:48:28 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Authentication-Results: mx.google.com;
dkim=pass header.i=@gmail.com header.s=20230601 header.b=RiVF9MGq;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.36 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by pete.vger.email (Postfix) with ESMTP id 090C583DB33F;
Fri, 1 Dec 2023 01:48:23 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1378086AbjLAJsI (ORCPT <rfc822;ruipengqi7@gmail.com>
+ 99 others); Fri, 1 Dec 2023 04:48:08 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54018 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1377899AbjLAJsG (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 1 Dec 2023 04:48:06 -0500
Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com
[IPv6:2a00:1450:4864:20::62c])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF7EC193;
Fri, 1 Dec 2023 01:48:12 -0800 (PST)
Received: by mail-ej1-x62c.google.com with SMTP id
a640c23a62f3a-a1a496a73ceso25226766b.2;
Fri, 01 Dec 2023 01:48:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1701424091; x=1702028891;
darn=vger.kernel.org;
h=cc:to:message-id:content-transfer-encoding:mime-version:subject
:date:from:from:to:cc:subject:date:message-id:reply-to;
bh=Guu0Z50m2NZpOq4m9gWLYS84w8ajfYt4+lCW/K6tb6g=;
b=RiVF9MGq/8Z8UXLSLe/CtKb1vkdkKR37P22KHWQ4T56fakhIHvojOVsDzMW0Veujzk
5uu+1rrBgg0yvgbiIY6t/sq3y+QbfPlzd+2AWfEkaF1xC9XTWv3VFwuHThlD75q71/BU
9eK83jZGsss4pMN5k0wf9XmnbIZaH34O0GSRoTRazuNUX9ktaOfNdo7P2v1a5iytS6oD
KXiF7XgJhH8ikn7G19YHEUBhDko4PjgUKYflsie3FtPJ1iZIH0jgnjhLsjQYuqOD4H4u
mZ0YQkbkVsaYBQRXNEMwZgy9PbpgnTxdKHsx2x1M89IKXK93v5lRPBHDdc3b3FyO/GrN
rYtA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1701424091; x=1702028891;
h=cc:to:message-id:content-transfer-encoding:mime-version:subject
:date:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=Guu0Z50m2NZpOq4m9gWLYS84w8ajfYt4+lCW/K6tb6g=;
b=dvoGCG3xAMf3CGlhDylk9WC+jR3OevPSqHjdz+d0QuXN656ofBgKVQuDxgVZ8I9SYl
VDkVkjQda+hJommxonBhi5E1RSPuxSKrKNHzUbjD3s/C/5YH+0+NMl8Q1VsyItH+V2wW
3IU8qRgdHCBgjpWhQJKTwEMIMyvlh0+y1RwO4heuT2Yq/NETuQwB2gV5G6Ros4ynfl3E
FPL8kPtD065T2IUrRzRASUwuHTPlPSMNukQUOxl3ssVLEF4Bmo2EOOIq9SuzVaHkaziq
UyZwmHCP8lglcB0630498oSG15QbMVrvw9UPjTXkoT0hEdZzqObh0ijUkezULkNeNNjA
HYlg==
X-Gm-Message-State: AOJu0YyR8xqzT3rAPQa7ypvKmali1Re0o+otMUc9F8CpR6pjPB8OldbH
03oxiBWx/+zeeP641o58iUI=
X-Received: by 2002:a17:906:2c52:b0:a19:a19b:78d2 with SMTP id
f18-20020a1709062c5200b00a19a19b78d2mr661399ejh.149.1701424090832;
Fri, 01 Dec 2023 01:48:10 -0800 (PST)
Received: from [127.0.1.1] (91-118-163-37.static.upcbusiness.at.
[91.118.163.37])
by smtp.gmail.com with ESMTPSA id
x24-20020a1709064a9800b00a0cd9d89a00sm1690019eju.151.2023.12.01.01.48.09
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 01 Dec 2023 01:48:10 -0800 (PST)
From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Date: Fri, 01 Dec 2023 10:48:03 +0100
Subject: [PATCH] iio: adc: MCP3564: fix calib_bias and calib_scale range
checks
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20231201-mcp3564_range_checks-v1-1-68f4436e22b0@gmail.com>
X-B4-Tracking: v=1; b=H4sIANKraWUC/x2N2wrCQAxEf6Xk2YVN1svir4iUNkY3WNeyQRFK/
93o45mZwyxg0lQMjt0CTd5q+qwOuOmAy1BvEvTiDBQpIUUMD57Tbr/t26/suQjfLRDhIeacMqY
Iro6DSRh9wsXl+pomD+cmV/38v07ndf0CceiHRHsAAAA=
To: Marius Cristea <marius.cristea@microchip.com>,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Javier Carrasco <javier.carrasco.cruz@gmail.com>
X-Mailer: b4 0.12.0
X-Developer-Signature: v=1; a=ed25519-sha256; t=1701424089; l=1792;
i=javier.carrasco.cruz@gmail.com; s=20230509; h=from:subject:message-id;
bh=nIPr2xEMTLh+1l6N+HRiGtOkvXXVgwfQC5WjZjTJ+xc=;
b=htgQgbGNIqqGqd+4j6SV19bIeaKy11mDcMt1CI7CJts4ZLKGRfdnJaKHauDzx0lIZtsEq3obi
r92GtNj4RJMC9YJ7pvOdsbYiFoHuJ0NWZid0s0K2UEVxI0RkSLDXXvq
X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519;
pk=tIGJV7M+tCizagNijF0eGMBGcOsPD+0cWGfKjl4h6K8=
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]);
Fri, 01 Dec 2023 01:48:23 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1784072486445670279
X-GMAIL-MSGID: 1784072486445670279
|
| Series |
iio: adc: MCP3564: fix calib_bias and calib_scale range checks
|
|
Commit Message
Javier Carrasco
Dec. 1, 2023, 9:48 a.m. UTC
The current implementation uses the AND (&&) operator to check if the
value to write for IIO_CHAN_INFO_CALIBBIAS and IIO_CHAN_INFO_CALIBSCALE
is within the valid ranges.
The evaluated values are the lower and upper limits of the ranges,
so this operation always evaluates to false.
The OR (||) operator must be used instead.
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
---
This bug has been found when looking for use cases of IIO_AVAIL_RANGE
and the fix could not be tested with real hardware. The issue and its
soulution are rather simple, but still some testing and confirmation
would be welcome.
---
drivers/iio/adc/mcp3564.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
base-commit: 994d5c58e50e91bb02c7be4a91d5186292a895c8
change-id: 20231201-mcp3564_range_checks-221708838130
Best regards,
Comments
Hi Javier Carrasco, Thank you for looking over the driver, for spotting and reporting the bug. Your fix is OK. Reviewed-by: Marius Cristea <marius.cristea@microchip.com> Thanks, Marius On Fri, 2023-12-01 at 10:48 +0100, Javier Carrasco wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you > know the content is safe > > The current implementation uses the AND (&&) operator to check if the > value to write for IIO_CHAN_INFO_CALIBBIAS and > IIO_CHAN_INFO_CALIBSCALE > is within the valid ranges. > The evaluated values are the lower and upper limits of the ranges, > so this operation always evaluates to false. > > The OR (||) operator must be used instead. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> > --- > This bug has been found when looking for use cases of IIO_AVAIL_RANGE > and the fix could not be tested with real hardware. The issue and its > soulution are rather simple, but still some testing and confirmation > would be welcome. > --- > drivers/iio/adc/mcp3564.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/mcp3564.c b/drivers/iio/adc/mcp3564.c > index e3f1de5fcc5a..d5fb1cae8aeb 100644 > --- a/drivers/iio/adc/mcp3564.c > +++ b/drivers/iio/adc/mcp3564.c > @@ -918,7 +918,7 @@ static int mcp3564_write_raw(struct iio_dev > *indio_dev, > mutex_unlock(&adc->lock); > return ret; > case IIO_CHAN_INFO_CALIBBIAS: > - if (val < mcp3564_calib_bias[0] && val > > mcp3564_calib_bias[2]) > + if (val < mcp3564_calib_bias[0] || val > > mcp3564_calib_bias[2]) > return -EINVAL; > > mutex_lock(&adc->lock); > @@ -928,7 +928,7 @@ static int mcp3564_write_raw(struct iio_dev > *indio_dev, > mutex_unlock(&adc->lock); > return ret; > case IIO_CHAN_INFO_CALIBSCALE: > - if (val < mcp3564_calib_scale[0] && val > > mcp3564_calib_scale[2]) > + if (val < mcp3564_calib_scale[0] || val > > mcp3564_calib_scale[2]) > return -EINVAL; > > if (adc->calib_scale == val) > > --- > base-commit: 994d5c58e50e91bb02c7be4a91d5186292a895c8 > change-id: 20231201-mcp3564_range_checks-221708838130 > > Best regards, > -- > Javier Carrasco <javier.carrasco.cruz@gmail.com> >
On Mon, 4 Dec 2023 09:23:45 +0000 <Marius.Cristea@microchip.com> wrote: > Hi Javier Carrasco, > > Thank you for looking over the driver and spotting and reporting the bug. Your fix is OK. > > Reviewed-by: Marius Cristea <marius.cristea@microchip.com> > Applied to the fixes-togreg branch of iio.git and marked for stable. Thanks, Jonathan > Thanks, > Marius > > ________________________________ > From: Javier Carrasco <javier.carrasco.cruz@gmail.com> > Sent: Friday, December 1, 2023 11:48 AM > To: Marius Cristea - M70257 <Marius.Cristea@microchip.com>; Jonathan Cameron <jic23@kernel.org>; Lars-Peter Clausen <lars@metafoo.de> > Cc: linux-iio@vger.kernel.org <linux-iio@vger.kernel.org>; linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>; Javier Carrasco <javier.carrasco.cruz@gmail.com> > Subject: [PATCH] iio: adc: MCP3564: fix calib_bias and calib_scale range checks > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > The current implementation uses the AND (&&) operator to check if the > value to write for IIO_CHAN_INFO_CALIBBIAS and IIO_CHAN_INFO_CALIBSCALE > is within the valid ranges. > The evaluated values are the lower and upper limits of the ranges, > so this operation always evaluates to false. > > The OR (||) operator must be used instead. > > Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> > --- > This bug has been found when looking for use cases of IIO_AVAIL_RANGE > and the fix could not be tested with real hardware. The issue and its > soulution are rather simple, but still some testing and confirmation > would be welcome. > --- > drivers/iio/adc/mcp3564.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/adc/mcp3564.c b/drivers/iio/adc/mcp3564.c > index e3f1de5fcc5a..d5fb1cae8aeb 100644 > --- a/drivers/iio/adc/mcp3564.c > +++ b/drivers/iio/adc/mcp3564.c > @@ -918,7 +918,7 @@ static int mcp3564_write_raw(struct iio_dev *indio_dev, > mutex_unlock(&adc->lock); > return ret; > case IIO_CHAN_INFO_CALIBBIAS: > - if (val < mcp3564_calib_bias[0] && val > mcp3564_calib_bias[2]) > + if (val < mcp3564_calib_bias[0] || val > mcp3564_calib_bias[2]) > return -EINVAL; > > mutex_lock(&adc->lock); > @@ -928,7 +928,7 @@ static int mcp3564_write_raw(struct iio_dev *indio_dev, > mutex_unlock(&adc->lock); > return ret; > case IIO_CHAN_INFO_CALIBSCALE: > - if (val < mcp3564_calib_scale[0] && val > mcp3564_calib_scale[2]) > + if (val < mcp3564_calib_scale[0] || val > mcp3564_calib_scale[2]) > return -EINVAL; > > if (adc->calib_scale == val) > > --- > base-commit: 994d5c58e50e91bb02c7be4a91d5186292a895c8 > change-id: 20231201-mcp3564_range_checks-221708838130 > > Best regards, > -- > Javier Carrasco <javier.carrasco.cruz@gmail.com> >
diff --git a/drivers/iio/adc/mcp3564.c b/drivers/iio/adc/mcp3564.c index e3f1de5fcc5a..d5fb1cae8aeb 100644 --- a/drivers/iio/adc/mcp3564.c +++ b/drivers/iio/adc/mcp3564.c @@ -918,7 +918,7 @@ static int mcp3564_write_raw(struct iio_dev *indio_dev, mutex_unlock(&adc->lock); return ret; case IIO_CHAN_INFO_CALIBBIAS: - if (val < mcp3564_calib_bias[0] && val > mcp3564_calib_bias[2]) + if (val < mcp3564_calib_bias[0] || val > mcp3564_calib_bias[2]) return -EINVAL; mutex_lock(&adc->lock); @@ -928,7 +928,7 @@ static int mcp3564_write_raw(struct iio_dev *indio_dev, mutex_unlock(&adc->lock); return ret; case IIO_CHAN_INFO_CALIBSCALE: - if (val < mcp3564_calib_scale[0] && val > mcp3564_calib_scale[2]) + if (val < mcp3564_calib_scale[0] || val > mcp3564_calib_scale[2]) return -EINVAL; if (adc->calib_scale == val)