Commit eb48d682 authored by William Tu's avatar William Tu Committed by David S. Miller

bpf: fix the printing of ifindex

Save the ifindex before it gets zeroed so the invalid
ifindex can be printed out.
Signed-off-by: default avatarWilliam Tu <u9012063@gmail.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6c00a3b
...@@ -2509,15 +2509,16 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp, ...@@ -2509,15 +2509,16 @@ int xdp_do_redirect(struct net_device *dev, struct xdp_buff *xdp,
{ {
struct redirect_info *ri = this_cpu_ptr(&redirect_info); struct redirect_info *ri = this_cpu_ptr(&redirect_info);
struct net_device *fwd; struct net_device *fwd;
u32 index = ri->ifindex;
if (ri->map) if (ri->map)
return xdp_do_redirect_map(dev, xdp, xdp_prog); return xdp_do_redirect_map(dev, xdp, xdp_prog);
fwd = dev_get_by_index_rcu(dev_net(dev), ri->ifindex); fwd = dev_get_by_index_rcu(dev_net(dev), index);
ri->ifindex = 0; ri->ifindex = 0;
ri->map = NULL; ri->map = NULL;
if (unlikely(!fwd)) { if (unlikely(!fwd)) {
bpf_warn_invalid_xdp_redirect(ri->ifindex); bpf_warn_invalid_xdp_redirect(index);
return -EINVAL; return -EINVAL;
} }
...@@ -2531,11 +2532,12 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb) ...@@ -2531,11 +2532,12 @@ int xdp_do_generic_redirect(struct net_device *dev, struct sk_buff *skb)
{ {
struct redirect_info *ri = this_cpu_ptr(&redirect_info); struct redirect_info *ri = this_cpu_ptr(&redirect_info);
unsigned int len; unsigned int len;
u32 index = ri->ifindex;
dev = dev_get_by_index_rcu(dev_net(dev), ri->ifindex); dev = dev_get_by_index_rcu(dev_net(dev), index);
ri->ifindex = 0; ri->ifindex = 0;
if (unlikely(!dev)) { if (unlikely(!dev)) {
bpf_warn_invalid_xdp_redirect(ri->ifindex); bpf_warn_invalid_xdp_redirect(index);
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment