diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-03-12 02:42:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-12 04:51:18 +0100 |
| commit | c29390c6dfeee0944ac6b5610ebbe403944378fc (patch) | |
| tree | befe951b043be948957abb1db65cee36dd7a379b /net/ipv4/ip_forward.c | |
| parent | xen-netback: notify immediately after pushing Tx response. (diff) | |
| download | linux-c29390c6dfeee0944ac6b5610ebbe403944378fc.tar.xz linux-c29390c6dfeee0944ac6b5610ebbe403944378fc.zip | |
xps: must clear sender_cpu before forwarding
John reported that my previous commit added a regression
on his router.
This is because sender_cpu & napi_id share a common location,
so get_xps_queue() can see garbage and perform an out of bound access.
We need to make sure sender_cpu is cleared before doing the transmit,
otherwise any NIC busy poll enabled (skb_mark_napi_id()) can trigger
this bug.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: John <jw@nuclearfallout.net>
Bisected-by: John <jw@nuclearfallout.net>
Fixes: 2bd82484bb4c ("xps: fix xps for stacked devices")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_forward.c')
| -rw-r--r-- | net/ipv4/ip_forward.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c index 787b3c294ce6..d9bc28ac5d1b 100644 --- a/net/ipv4/ip_forward.c +++ b/net/ipv4/ip_forward.c @@ -67,6 +67,7 @@ static int ip_forward_finish(struct sk_buff *skb) if (unlikely(opt->optlen)) ip_forward_options(skb); + skb_sender_cpu_clear(skb); return dst_output(skb); } |