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 B556817A2E8; Mon, 10 Mar 2025 18:01:38 +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=1741629698; cv=none; b=hq1SCenxvKGHzCU1Ogh060E6Zmb2IHWTRDfGieBu5XMKIoLbWRcW66KyfWHRS8q4HXggjDbvd1rlt0cM3jc2UTOY0zqwfPH37WiXGMgcziJ6PugcHEh7C4hH66kgQZCf4OE+ziPevrKCPalCiirAjehfXN434LwGJhnLuq7ri4E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741629698; c=relaxed/simple; bh=bO/47MeOZdm8ONalWVCnSKBhK/d2IdkwhMLz74/Ysjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e1ytz4/r6RyOQraUK0DyUxmhy+p0ybjpRlTiNao+jmuPPWlUQ5mLsCDdQaxxxBGWB/aI2QQMCrAROxgetzl2GKNbtCMO97l0JjAr8o4uNcuDBeY0pAqVL97SChV7Zw6L5CZg5U2CAJA5hJTXkp2stGhu+KO6Xrn+OkLpi1PzX+s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t1+nawHD; 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="t1+nawHD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F7E5C4CEE5; Mon, 10 Mar 2025 18:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741629698; bh=bO/47MeOZdm8ONalWVCnSKBhK/d2IdkwhMLz74/Ysjc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t1+nawHD8KhqHJkeyhnkGM0hx6UG2fENzeBPrI9XzsqpBnJLih7y7rbx/ZC5j7aAx EHOF4DXhLE1BDjQct2/iuMzxEja2HHMxeKCe6mXbPcVbnGKRUzAvwQ7CB4eaIPFH3i 1ZJi6yVlFf719n0CdAwQpAMNXV83maKr9p4WmncY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Bartosz Golaszewski Subject: [PATCH 5.15 383/620] gpio: stmpe: Check return value of stmpe_reg_read in stmpe_gpio_irq_sync_unlock Date: Mon, 10 Mar 2025 18:03:49 +0100 Message-ID: <20250310170600.710695512@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Wentao Liang commit b9644fbfbcab13da7f8b37bef7c51e5b8407d031 upstream. The stmpe_reg_read function can fail, but its return value is not checked in stmpe_gpio_irq_sync_unlock. This can lead to silent failures and incorrect behavior if the hardware access fails. This patch adds checks for the return value of stmpe_reg_read. If the function fails, an error message is logged and the function returns early to avoid further issues. Fixes: b888fb6f2a27 ("gpio: stmpe: i2c transfer are forbiden in atomic context") Cc: stable@vger.kernel.org # 4.16+ Signed-off-by: Wentao Liang Link: https://lore.kernel.org/r/20250212021849.275-1-vulab@iscas.ac.cn Signed-off-by: Bartosz Golaszewski Signed-off-by: Greg Kroah-Hartman --- drivers/gpio/gpio-stmpe.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) --- a/drivers/gpio/gpio-stmpe.c +++ b/drivers/gpio/gpio-stmpe.c @@ -191,7 +191,7 @@ static void stmpe_gpio_irq_sync_unlock(s [REG_IE][CSB] = STMPE_IDX_IEGPIOR_CSB, [REG_IE][MSB] = STMPE_IDX_IEGPIOR_MSB, }; - int i, j; + int ret, i, j; /* * STMPE1600: to be able to get IRQ from pins, @@ -199,8 +199,16 @@ static void stmpe_gpio_irq_sync_unlock(s * GPSR or GPCR registers */ if (stmpe->partnum == STMPE1600) { - stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_GPMR_LSB]); - stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_GPMR_CSB]); + ret = stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_GPMR_LSB]); + if (ret < 0) { + dev_err(stmpe->dev, "Failed to read GPMR_LSB: %d\n", ret); + goto err; + } + ret = stmpe_reg_read(stmpe, stmpe->regs[STMPE_IDX_GPMR_CSB]); + if (ret < 0) { + dev_err(stmpe->dev, "Failed to read GPMR_CSB: %d\n", ret); + goto err; + } } for (i = 0; i < CACHE_NR_REGS; i++) { @@ -222,6 +230,7 @@ static void stmpe_gpio_irq_sync_unlock(s } } +err: mutex_unlock(&stmpe_gpio->irq_lock); }