usb: typec: tipd: improve handling of failures in interrupt handlers
Subsystems (2)
PATCH 1/1 usb: typec: tipd: improve handling of failures in interrupt handlers
clang static analysis reports this representative issue core.c:516:6: warning: Branch condition evaluates
to a garbage value
if (event)
^~~~~
In cd321x_interrupt(), a successful call totps6598x_read64() is the only way event is set,
and if a failure happens the irq should not be
reported as handled.
Instead of initializing event, rework the
usage of ret by initializing it to IRQ_NONE
and then setting it when event is known to
be not zero. This removes the if-statement
before the return.
tps6598x_interrupt() is similar.
--- drivers/usb/typec/tipd/core.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
drivers/usb/typec/tipd/core.c +11 -13
@@ -478,12 +478,11 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)struct tps6598x *tps = data;u64 event;u32 status; -int ret; +int ret =IRQ_NONE ;mutex_lock (&tps->lock); - ret =tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event); -if (ret) { +if (tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event)) {dev_err (tps->dev,"%s: failed to read events\n" , __func__); goto err_unlock; }
@@ -492,6 +491,8 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)if (!event) goto err_unlock; + ret =IRQ_HANDLED ; +if (!tps6598x_read_status (tps, &status)) goto err_clear_ints;
@@ -513,9 +514,7 @@ static irqreturn_t cd321x_interrupt(int irq, void *data) err_unlock:mutex_unlock (&tps->lock); -if (event) -return IRQ_HANDLED ; -return IRQ_NONE ; +return ret; }static irqreturn_t tps6598x_interrupt (int irq,void *data)
@@ -524,13 +523,12 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)u64 event1;u64 event2;u32 status; -int ret; +int ret =IRQ_NONE ;mutex_lock (&tps->lock); - ret =tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event1); - ret |=tps6598x_read64 (tps,TPS_REG_INT_EVENT2 , &event2); -if (ret) { +if (tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event1) || +tps6598x_read64 (tps,TPS_REG_INT_EVENT2 , &event2)) {dev_err (tps->dev,"%s: failed to read events\n" , __func__); goto err_unlock; }
@@ -539,6 +537,8 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)if (!(event1 | event2)) goto err_unlock; + ret =IRQ_HANDLED ; +if (!tps6598x_read_status (tps, &status)) goto err_clear_ints;
@@ -561,9 +561,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data) err_unlock:mutex_unlock (&tps->lock); -if (event1 | event2) -return IRQ_HANDLED ; -return IRQ_NONE ; +return ret; }static int tps6598x_check_mode (struct tps6598x *tps)
Signature · 1 line
2.27.0
Hi Tom,
Thanks for the patch!
Quoted 17 lines · Tom Rix
clang static analysis reports this representative issue core.c:516:6: warning: Branch condition evaluates
to a garbage value
if (event)^~~~~In
cd321x_interrupt(), a successful call totps6598x_read64()is the only way event is set, and if a failure happens the irq should not be reported as handled.Instead of initializing event, rework the usage of ret by initializing it to
IRQ_NONEand then setting it when event is known to
be not zero. This removes the if-statement before the return.
Quoted 3 lines
tps6598x_interrupt()is similar.Fixes 0a4c005bd171 ("usb: typec: driver for TI TPS6598x USB Power Delivery controllers")
I am not sure this fixes tag is accurate. At that point in time, tps6598x_interrupt() did not have any use of event1 or event2 that was uninitialized.
I think
is a more accurate set, as these changes made it possible for the event variables to be used uninitialized.
Quoted 1 line
Signed-off-by Tom Rix <[email protected]>
I found one issue below. With that addressed, feel free to carry forward:
Quoted 47 lines
--- drivers/usb/typec/tipd/core.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)drivers/usb/typec/tipd/core.c +5
-6@@ -478,12 +478,11 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)struct tps6598x *tps = data;u64 event;u32 status; -int ret; +int ret =IRQ_NONE ;mutex_lock (&tps->lock); - ret =tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event); -if (ret) { +if (tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event)) {dev_err (tps->dev,"%s: failed to read events\n" , __func__); goto err_unlock; }@@ -492,6 +491,8 @@ static irqreturn_t cd321x_interrupt(int irq, void *data)if (!event) goto err_unlock; + ret =IRQ_HANDLED ; +if (!tps6598x_read_status (tps, &status)) goto err_clear_ints;@@ -513,9 +514,7 @@ static irqreturn_t cd321x_interrupt(int irq, void *data) err_unlock:mutex_unlock (&tps->lock); -if (event) -return IRQ_HANDLED ; -return IRQ_NONE ; +return ret; }static irqreturn_t tps6598x_interrupt (int irq,void *data)@@ -524,13 +523,12 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)u64 event1;u64 event2;u32 status;
drivers/usb/typec/tipd/core.c static irqreturn_t tps6598x_interrupt(int irq, void *data) · line 531
Quoted 10 lines
drivers/usb/typec/tipd/core.c +3
-4-int ret; +int ret =IRQ_NONE ;mutex_lock (&tps->lock); - ret =tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event1); - ret |=tps6598x_read64 (tps,TPS_REG_INT_EVENT2 , &event2); -if (ret) { +if (tps6598x_read64 (tps,TPS_REG_INT_EVENT1 , &event1) || +tps6598x_read64 (tps,TPS_REG_INT_EVENT2 , &event2)) {
This change is incorrect. If the first tps6598x_read64() call succeeds, then the second tps6598x_read64() will not be called, which would leave event2 uninitialized. This should be a bitwise OR so that both calls to tps6598x_read64() occur.
Quoted 27 lines
drivers/usb/typec/tipd/core.c +3
-3dev_err (tps->dev,"%s: failed to read events\n" , __func__); goto err_unlock; }@@ -539,6 +537,8 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)if (!(event1 | event2)) goto err_unlock; + ret =IRQ_HANDLED ; +if (!tps6598x_read_status (tps, &status)) goto err_clear_ints;@@ -561,9 +561,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data) err_unlock:mutex_unlock (&tps->lock); -if (event1 | event2) -return IRQ_HANDLED ; -return IRQ_NONE ; +return ret; }static int tps6598x_check_mode (struct tps6598x *tps)Signature · 1 line
2.27.0
Greg KH
maintainerQuoted 10 lines · Tom Rix
clang static analysis reports this representative issue core.c:516:6: warning: Branch condition evaluates
to a garbage value
if (event)^~~~~In
cd321x_interrupt(), a successful call totps6598x_read64()is the only way event is set, and if a failure happens the irq should not be reported as handled.
Please use the full 72 columns.
Quoted 6 lines
Instead of initializing event, rework the usage of ret by initializing it to
IRQ_NONEand then setting it when event is known to
be not zero. This removes the if-statement before the return.
So the code today is correct, but clang is wrong? We don't need to do anything then...
Quoted 1 line
tps6598x_interrupt()is similar.
This line makes no sense, sorry.
greg k-h