* [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
@ 2022-11-02 16:15 Sven Peter
2022-11-02 17:05 ` Eric Curtin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Sven Peter @ 2022-11-02 16:15 UTC (permalink / raw)
To: Heikki Krogerus, Greg Kroah-Hartman
Cc: Sven Peter, Hector Martin, Guido Günther, linux-usb,
linux-kernel, asahi
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")
Signed-off-by: Sven Peter <sven@svenpeter.dev>
---
drivers/usb/typec/tipd/core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index b637e8b378b3..2a77bab948f5 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
2022-11-02 16:15 [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler Sven Peter
@ 2022-11-02 17:05 ` Eric Curtin
2022-11-03 8:19 ` Guido Günther
2022-11-03 15:43 ` Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Eric Curtin @ 2022-11-02 17:05 UTC (permalink / raw)
To: Sven Peter
Cc: Heikki Krogerus, Greg Kroah-Hartman, Hector Martin,
Guido Günther, linux-usb, linux-kernel, asahi
On Wed, 2 Nov 2022 at 16:24, Sven Peter <sven@svenpeter.dev> wrote:
>
> 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")
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
> ---
> drivers/usb/typec/tipd/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index b637e8b378b3..2a77bab948f5 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -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
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
2022-11-02 16:15 [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler Sven Peter
2022-11-02 17:05 ` Eric Curtin
@ 2022-11-03 8:19 ` Guido Günther
2022-11-03 15:43 ` Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Guido Günther @ 2022-11-03 8:19 UTC (permalink / raw)
To: Sven Peter
Cc: Heikki Krogerus, Greg Kroah-Hartman, Hector Martin, linux-usb,
linux-kernel, asahi
Hi,
On Wed, Nov 02, 2022 at 05:15:42PM +0100, Sven Peter wrote:
> 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")
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
> ---
> drivers/usb/typec/tipd/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index b637e8b378b3..2a77bab948f5 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -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;
Reviewed-by: Guido Günther <agx@sigxcpu.org>
Cheers,
-- Guido
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler
2022-11-02 16:15 [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler Sven Peter
2022-11-02 17:05 ` Eric Curtin
2022-11-03 8:19 ` Guido Günther
@ 2022-11-03 15:43 ` Heikki Krogerus
2 siblings, 0 replies; 4+ messages in thread
From: Heikki Krogerus @ 2022-11-03 15:43 UTC (permalink / raw)
To: Sven Peter
Cc: Greg Kroah-Hartman, Hector Martin, Guido Günther, linux-usb,
linux-kernel, asahi
On Wed, Nov 02, 2022 at 05:15:42PM +0100, Sven Peter wrote:
> 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")
> Signed-off-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/typec/tipd/core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index b637e8b378b3..2a77bab948f5 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -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;
>
thanks,
--
heikki
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-03 15:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-02 16:15 [PATCH] usb: typec: tipd: Prevent uninitialized event{1,2} in IRQ handler Sven Peter
2022-11-02 17:05 ` Eric Curtin
2022-11-03 8:19 ` Guido Günther
2022-11-03 15:43 ` Heikki Krogerus
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.