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 6990126B94A; Tue, 8 Apr 2025 12:19:06 +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=1744114746; cv=none; b=o06kWCp1aWQ1seL/wsJAIXW0QnJw4O5E1oDbfYh5TjOwv3knmiGLKspcMuV9cYRKiA0qQYU4U2vjvTSgeraCsQ/JyHKmFbPJjLIpdrhutHvt+PESAJMlXfJuWpyYihwlhOgPFlmWjtawJ6b5O/0YtbV9cWI2jywK9pjJ7D4J11s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744114746; c=relaxed/simple; bh=KxPB2JSV/jDAmeBu1U/ivrt12JUjX1Mj30uzezqIaqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vhsr0NqAT8359OXnwXTYFkhM+Xg/2/nuATTpeCreMBHnVgX0n9a/GgK33m8V6QhNm8dahDNr9Hz9hXpNeTRy4bvND3X+do1y5lsVWnecqT46OAzJcEoBWI0LPcGYF131tLMR+V3SfXUQf3O7GTUR7uc6l+DYDZgFPpvvfJcNIGg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cJEutM86; 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="cJEutM86" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC7D2C4CEE5; Tue, 8 Apr 2025 12:19:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744114746; bh=KxPB2JSV/jDAmeBu1U/ivrt12JUjX1Mj30uzezqIaqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cJEutM86tulbqdNN6eM9XIzxvWZDWnvTPJ0Aui+viaL9tBkUAR3Xbv5iuB244LhCl 2A5wdGGYt/5qwjQTOwMvFRXk/IwCnmxpWLwmVtgHSskaJXrw26AutnT3ySsdh7lRT6 zmgVv20bHQty65md6Vmze9WtoyZ7g5hZoUhaFfa4= 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 6.13 221/499] iio: accel: mma8452: Ensure error return on failure to matching oversampling ratio Date: Tue, 8 Apr 2025 12:47:13 +0200 Message-ID: <20250408104856.721283943@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104851.256868745@linuxfoundation.org> References: <20250408104851.256868745@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 6.13-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 962d289065ab7..1b2014c4c4b46 100644 --- a/drivers/iio/accel/mma8452.c +++ b/drivers/iio/accel/mma8452.c @@ -712,7 +712,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) @@ -772,14 +772,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