usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
Subsystems (2)
PATCH 1/1 usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
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.
--- drivers/usb/typec/tipd/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/typec/tipd/core.c +3 -3
@@ -474,7 +474,7 @@ static void tps6598x_handle_plug_event(struct tps6598x *tps, u32 status)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 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)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;
Signature · 1 line
2.25.1
Quoted 8 lines · Sven Peter
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_HANDLEDvs.IRQ_NONEin the error path.Fixes c7260e29dd20 ("usb: typec: tipd: Add short-circuit for no irqs")Fixes 45188f27b3d0 ("usb: typec: tipd: Add support for Apple CD321X")Signed-off-by Sven Peter <[email protected]>
Quoted 32 lines
--- drivers/usb/typec/tipd/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/usb/typec/tipd/core.c +3
-4@@ -474,7 +474,7 @@ static void tps6598x_handle_plug_event(struct tps6598x *tps, u32 status)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 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)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; --2.25.1
Hi,
Quoted 25 lines · Sven Peter
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_HANDLEDvs.IRQ_NONEin the error path.Fixes c7260e29dd20 ("usb: typec: tipd: Add short-circuit for no irqs")Fixes 45188f27b3d0 ("usb: typec: tipd: Add support for Apple CD321X")Signed-off-by Sven Peter <[email protected]>--- drivers/usb/typec/tipd/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/usb/typec/tipd/core.c +1
-1@@ -474,7 +474,7 @@ static void tps6598x_handle_plug_event(struct tps6598x *tps, u32 status)static irqreturn_t cd321x_interrupt (int irq,void *data) {struct tps6598x *tps = data; -u64 event; +u64 event =0 ;u32 status;int ret;
drivers/usb/typec/tipd/core.c static irqreturn_t cd321x_interrupt(int irq, void *data) · line 525
Quoted 9 lines
drivers/usb/typec/tipd/core.c +2
-2@@ -519,8 +519,8 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)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;
Cheers,
-- Guido
Quoted 7 lines · Sven Peter
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_HANDLEDvs.IRQ_NONEin the error path.Fixes c7260e29dd20 ("usb: typec: tipd: Add short-circuit for no irqs")Fixes 45188f27b3d0 ("usb: typec: tipd: Add support for Apple CD321X")Signed-off-by Sven Peter <[email protected]>
Quoted 18 lines
--- drivers/usb/typec/tipd/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/usb/typec/tipd/core.c +1
-1@@ -474,7 +474,7 @@ static void tps6598x_handle_plug_event(struct tps6598x *tps, u32 status)static irqreturn_t cd321x_interrupt (int irq,void *data) {struct tps6598x *tps = data; -u64 event; +u64 event =0 ;u32 status;int ret;
drivers/usb/typec/tipd/core.c static irqreturn_t cd321x_interrupt(int irq, void *data) · line 526
Quoted 10 lines
drivers/usb/typec/tipd/core.c +2
-2@@ -519,8 +519,8 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)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;
thanks,
Signature · 1 line
heikki