This is a note to let you know that I've just added the patch titled
usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-typec-tipd-prevent-uninitialized-event-1-2-in-irq-handler.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6d8fc203b28ff8f6115fbe5eaf584de8b824f4fa Mon Sep 17 00:00:00 2001
From: Sven Peter <sven@xxxxxxxxxxxxx>
Date: Wed, 2 Nov 2022 17:15:42 +0100
Subject: usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Sven Peter <sven@xxxxxxxxxxxxx>
commit 6d8fc203b28ff8f6115fbe5eaf584de8b824f4fa upstream.
If reading TPS_REG_INT_EVENT1/2 fails in the interrupt handler event1
and event2 may be uninitialized when they are used to determine
IRQ_HANDLED vs. IRQ_NONE in the error path.
Fixes: c7260e29dd20 ("usb: typec: tipd: Add short-circuit for no irqs")
Fixes: 45188f27b3d0 ("usb: typec: tipd: Add support for Apple CD321X")
Cc: stable <stable@xxxxxxxxxx>
Signed-off-by: Sven Peter <sven@xxxxxxxxxxxxx>
Reviewed-by: Eric Curtin <ecurtin@xxxxxxxxxx>
Reviewed-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
Reviewed-by: Guido Günther <agx@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20221102161542.30669-1-sven@xxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/usb/typec/tipd/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -474,7 +474,7 @@ static void tps6598x_handle_plug_event(s
static irqreturn_t cd321x_interrupt(int irq, void *data)
{
struct tps6598x *tps = data;
- u64 event;
+ u64 event = 0;
u32 status;
int ret;
@@ -519,8 +519,8 @@ err_unlock:
static irqreturn_t tps6598x_interrupt(int irq, void *data)
{
struct tps6598x *tps = data;
- u64 event1;
- u64 event2;
+ u64 event1 = 0;
+ u64 event2 = 0;
u32 status;
int ret;
Patches currently in stable-queue which might be from sven@xxxxxxxxxxxxx are
queue-6.0/usb-dwc3-do-not-get-extcon-device-when-usb-role-switch-is-used.patch
queue-6.0/usb-typec-tipd-prevent-uninitialized-event-1-2-in-irq-handler.patch
