* [PATCH] net: cavium: liquidio: fix check for in progress flag
@ 2016-02-05 16:30 Colin King
2016-02-13 11:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2016-02-05 16:30 UTC (permalink / raw)
To: Derek Chickles, Satanand Burla, Felix Manlunas, Raghu Vatsavayi,
netdev
Cc: linux-kernel
From: Colin Ian King <colin.king@canonical.com>
smatch detected a suspicious looking bitop condition:
drivers/net/ethernet/cavium/liquidio/lio_main.c:2529
handle_timestamp() warn: suspicious bitop condition
(skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS is always non-zero,
so the logic is definitely not correct. Use & to mask the correct
bit.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 8727655..06b6be8 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -2524,7 +2524,7 @@ static void handle_timestamp(struct octeon_device *oct,
octeon_swap_8B_data(&resp->timestamp, 1);
- if (unlikely((skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS) != 0)) {
+ if (unlikely((skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) != 0)) {
struct skb_shared_hwtstamps ts;
u64 ns = resp->timestamp;
--
2.7.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] net: cavium: liquidio: fix check for in progress flag
2016-02-05 16:30 [PATCH] net: cavium: liquidio: fix check for in progress flag Colin King
@ 2016-02-13 11:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-02-13 11:06 UTC (permalink / raw)
To: colin.king
Cc: derek.chickles, satananda.burla, felix.manlunas, raghu.vatsavayi,
netdev, linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Fri, 5 Feb 2016 16:30:39 +0000
> From: Colin Ian King <colin.king@canonical.com>
>
> smatch detected a suspicious looking bitop condition:
>
> drivers/net/ethernet/cavium/liquidio/lio_main.c:2529
> handle_timestamp() warn: suspicious bitop condition
>
> (skb_shinfo(skb)->tx_flags | SKBTX_IN_PROGRESS is always non-zero,
> so the logic is definitely not correct. Use & to mask the correct
> bit.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied, thanks.
But this means one of the code paths was never tested...
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-13 11:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-05 16:30 [PATCH] net: cavium: liquidio: fix check for in progress flag Colin King
2016-02-13 11:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).