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 F35C113D896; Tue, 23 Jul 2024 18:43:21 +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=1721760202; cv=none; b=XiZwdNvhE6SaxNislh02HXcgrqPPCHMLri17LjwbVOrXCND2oWSCV0QU80LDb2Ho21i7EmriS5PQNmCLLKUp1pQQlK4MwPOGKYeVpuKrzSbKvF3jvwnQh2BIxQTUajCWZyZh6RV/YZmDIfKe9A89oHufbsuQ/9BLU4ySWxomlpM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721760202; c=relaxed/simple; bh=vztjWwC20udSGUvMA4UF5578Q45b8bz/i7brubcHtV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=raJE1dwNaTpEY3VwLgXI2ctTqt9qqnYmwSwOBovm8whHfKrKzZOtJKewA6NeWLDePZRDuMy2Z+t4bLtxcEx25h4oiziEykhMNmTvneO0f/s3DtXRy+HT/EaS9orbQZz3dgn08cf8Gqcxpmblh4AWNcW4n/uZma1ksF+yftixylA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tOkRYCgD; 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="tOkRYCgD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77E63C4AF09; Tue, 23 Jul 2024 18:43:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721760201; bh=vztjWwC20udSGUvMA4UF5578Q45b8bz/i7brubcHtV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOkRYCgD8YJIH8nI9E/0nFXnO1R8fpbI4Hl0/O4q6vTF26GKSdzsZsOXQSxWaltGr sjUz1NmVcpGRzWm02HxIvit33G6ZfxRa2idsR9dDv8EaeJzsCybnIVlJf2jFFO2CiJ vQCJJy8dFei/f2R8rvCBcTegA0MQ6sTR2Ow4vkuE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Ray , Bartosz Golaszewski , Sasha Levin Subject: [PATCH 6.9 106/163] gpio: pca953x: fix pca953x_irq_bus_sync_unlock race Date: Tue, 23 Jul 2024 20:23:55 +0200 Message-ID: <20240723180147.570483899@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180143.461739294@linuxfoundation.org> References: <20240723180143.461739294@linuxfoundation.org> User-Agent: quilt/0.67 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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Ray [ Upstream commit bfc6444b57dc7186b6acc964705d7516cbaf3904 ] Ensure that `i2c_lock' is held when setting interrupt latch and mask in pca953x_irq_bus_sync_unlock() in order to avoid races. The other (non-probe) call site pca953x_gpio_set_multiple() ensures the lock is held before calling pca953x_write_regs(). The problem occurred when a request raced against irq_bus_sync_unlock() approximately once per thousand reboots on an i.MX8MP based system. * Normal case 0-0022: write register AI|3a {03,02,00,00,01} Input latch P0 0-0022: write register AI|49 {fc,fd,ff,ff,fe} Interrupt mask P0 0-0022: write register AI|08 {ff,00,00,00,00} Output P3 0-0022: write register AI|12 {fc,00,00,00,00} Config P3 * Race case 0-0022: write register AI|08 {ff,00,00,00,00} Output P3 0-0022: write register AI|08 {03,02,00,00,01} *** Wrong register *** 0-0022: write register AI|12 {fc,00,00,00,00} Config P3 0-0022: write register AI|49 {fc,fd,ff,ff,fe} Interrupt mask P0 Signed-off-by: Ian Ray Link: https://lore.kernel.org/r/20240620042915.2173-1-ian.ray@gehealthcare.com Signed-off-by: Bartosz Golaszewski Signed-off-by: Sasha Levin --- drivers/gpio/gpio-pca953x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 00ffa168e4056..f2f40393e3695 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -758,6 +758,8 @@ static void pca953x_irq_bus_sync_unlock(struct irq_data *d) int level; if (chip->driver_data & PCA_PCAL) { + guard(mutex)(&chip->i2c_lock); + /* Enable latch on interrupt-enabled inputs */ pca953x_write_regs(chip, PCAL953X_IN_LATCH, chip->irq_mask); -- 2.43.0