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 A8C961B6CFA; Wed, 19 Feb 2025 09:30:45 +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=1739957446; cv=none; b=fmXdzAi8SBSAGoL2yjctcP1CKu/hx1Bu4vNzoeEJ0x7L5/eq/ocIZySJ6YEm9WiVRhKwnJCdGNExdPknS5TKwzctqSspXYxV8OXAV7QAA2G+FFzI9K1kyIoYBDXUpW/B7U28IVu3NQ1jU+3fYp0JA9bvtkYwr8GASOZSbrSUFNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739957446; c=relaxed/simple; bh=T0FGItJtQvwiYN5+mdMX2EFycOG/dD5V9ZqwrIyD1ac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g5ky16o8ZkwRW+Sq8zAh3HDjSN7BFB9cXRRPfvqQIKg2lV+P79oQ35dQ5Fd/7ABUTkLM/77stlNzRdsobwev19p4nYoIGr9ohhdqJq8zV3xbSEyG25pJcyTYbU26StyLEZr50CPUk99mRx4q0QRJ0ZsbVauSNxfW4VNr8ikAwDA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N9QAzC1b; 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="N9QAzC1b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA85BC4CED1; Wed, 19 Feb 2025 09:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739957445; bh=T0FGItJtQvwiYN5+mdMX2EFycOG/dD5V9ZqwrIyD1ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N9QAzC1bm58wOCWss+KboPq3CeO3SgrDetvefJpoQwf8W075+bTmv2bhXHcGErVbL HHvzGNXbUNgdhRFYIlbW+WYyfUEpLkmtJC0MecRqLW1wJlvoI1Mgg1qd5fDavL75MN pFUt44OkgUaIIrHPxETPMQ7O+B/4xkl8jXpqCoI8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wentao Liang , Bartosz Golaszewski Subject: [PATCH 6.1 529/578] gpio: stmpe: Check return value of stmpe_reg_read in stmpe_gpio_irq_sync_unlock Date: Wed, 19 Feb 2025 09:28:53 +0100 Message-ID: <20250219082713.785900330@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082652.891560343@linuxfoundation.org> References: <20250219082652.891560343@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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); }