This is a note to let you know that I've just added the patch titled
dp83640: don't recieve time stamps twice
to the 4.10-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:
dp83640-don-t-recieve-time-stamps-twice.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Apr 29 08:22:40 CEST 2017
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Tue, 18 Apr 2017 22:14:26 +0300
Subject: dp83640: don't recieve time stamps twice
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
[ Upstream commit 9d386cd9a755c8293e8916264d4d053878a7c9c7 ]
This patch is prompted by a static checker warning about a potential
use after free. The concern is that netif_rx_ni() can free "skb" and we
call it twice.
When I look at the commit that added this, it looks like some stray
lines were added accidentally. It doesn't make sense to me that we
would recieve the same data two times. I asked the author but never
recieved a response.
I can't test this code, but I'm pretty sure my patch is correct.
Fixes: 4b063258ab93 ("dp83640: Delay scheduled work.")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Acked-by: Stefan Sørensen <stefan.sorensen@xxxxxxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/phy/dp83640.c | 2 --
1 file changed, 2 deletions(-)
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1438,8 +1438,6 @@ static bool dp83640_rxtstamp(struct phy_
skb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT;
skb_queue_tail(&dp83640->rx_queue, skb);
schedule_delayed_work(&dp83640->ts_work, SKB_TIMESTAMP_TIMEOUT);
- } else {
- netif_rx_ni(skb);
}
return true;
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-4.10/dp83640-don-t-recieve-time-stamps-twice.patch
queue-4.10/ipv6-sr-fix-double-free-of-skb-after-handling-invalid-srh.patch