From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A6D269D09; Tue, 8 Apr 2025 11:01:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110095; cv=none; b=bk6f4B3q4UfYc3OGo9XEI6l9kolKaYosVdHX4Gn0N6gLXiiA24AOHwku1irw3HxNx9oGNF63KgoZUb6doWXhSTmKwzstAxpQ4LvQfIjfYqCgkwPwd+r5huJzdiSOxf4mzu3zzmZtzy8zZiAvIGM/yn4Ob+WPlSFImgdN8gt54cU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744110095; c=relaxed/simple; bh=LJd+Aa90wsjcq6L9/GbxQRlYiGjQct1073s2lRoM1t4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DjPfjRXOe2pVx7tSAfZCtVvAyLBhw16k3291iJZezQMmYaoxEQWEsq6JW49pobMxYc4/7+paxv9xoLb0+WYv1sDJ0pqUfLot3HAzQ5QQTsCemOMVgfUEvzuKMaMtpjjZw8JBzRvOrkgR9Pd3OUGygz+xbz/VKJfNhr/csd8H1Bg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nco1nwRL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nco1nwRL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0924CC4CEEC; Tue, 8 Apr 2025 11:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744110095; bh=LJd+Aa90wsjcq6L9/GbxQRlYiGjQct1073s2lRoM1t4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nco1nwRL1Auuh91nz0pMkuOlgCoplxSXqgSt/ElqhWoAuOSrDVPCZR1Rk26TS56co boDGN5a/NYgasswprU7DDNyCaOQWSz0bKRJBp6l2YGWjlA2bLYhW6JCax2TPScr8Vs L5amHJu2SFql6/x5uzpjaus+XgHzC0zdqR6ra5A8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Lechner , Jonathan Cameron , Sasha Levin Subject: [PATCH 5.10 164/227] iio: accel: mma8452: Ensure error return on failure to matching oversampling ratio Date: Tue, 8 Apr 2025 12:49:02 +0200 Message-ID: <20250408104825.237884117@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104820.353768086@linuxfoundation.org> References: <20250408104820.353768086@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jonathan Cameron [ Upstream commit df330c808182a8beab5d0f84a6cbc9cff76c61fc ] If a match was not found, then the write_raw() callback would return the odr index, not an error. Return -EINVAL if this occurs. To avoid similar issues in future, introduce j, a new indexing variable rather than using ret for this purpose. Fixes: 79de2ee469aa ("iio: accel: mma8452: claim direct mode during write raw") Reviewed-by: David Lechner Link: https://patch.msgid.link/20250217140135.896574-2-jic23@kernel.org Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/accel/mma8452.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c index b12e804647063..760ee0685034b 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -711,7 +711,7 @@ static int mma8452_write_raw(struct iio_dev *indio_dev, int val, int val2, long mask) { struct mma8452_data *data = iio_priv(indio_dev); - int i, ret; + int i, j, ret; ret = iio_device_claim_direct_mode(indio_dev); if (ret) @@ -771,14 +771,18 @@ static int mma8452_write_raw(struct iio_dev *indio_dev, break; case IIO_CHAN_INFO_OVERSAMPLING_RATIO: - ret = mma8452_get_odr_index(data); + j = mma8452_get_odr_index(data); for (i = 0; i < ARRAY_SIZE(mma8452_os_ratio); i++) { - if (mma8452_os_ratio[i][ret] == val) { + if (mma8452_os_ratio[i][j] == val) { ret = mma8452_set_power_mode(data, i); break; } } + if (i == ARRAY_SIZE(mma8452_os_ratio)) { + ret = -EINVAL; + break; + } break; default: ret = -EINVAL; -- 2.39.5