diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2018-06-14 11:07:42 +0900 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-06-15 23:47:15 +0200 |
| commit | 6d5fc1957989266006db6ef3dfb9159b42cf0189 (patch) | |
| tree | 29028cc0eb4f60c5c822a6fd4096c193376cf5dd /kernel/bpf | |
| parent | b5518c705178cb96fd2b775e0c070e72b5d0d688 (diff) | |
| download | linux-stable-6d5fc1957989266006db6ef3dfb9159b42cf0189.tar.gz linux-stable-6d5fc1957989266006db6ef3dfb9159b42cf0189.tar.bz2 linux-stable-6d5fc1957989266006db6ef3dfb9159b42cf0189.zip | |
xdp: Fix handling of devmap in generic XDP
Commit 67f29e07e131 ("bpf: devmap introduce dev_map_enqueue") changed
the return value type of __devmap_lookup_elem() from struct net_device *
to struct bpf_dtab_netdev * but forgot to modify generic XDP code
accordingly.
Thus generic XDP incorrectly used struct bpf_dtab_netdev where struct
net_device is expected, then skb->dev was set to invalid value.
v2:
- Fix compiler warning without CONFIG_BPF_SYSCALL.
Fixes: 67f29e07e131 ("bpf: devmap introduce dev_map_enqueue")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/devmap.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index a7cc7b3494a9..642c97f6d1b8 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -345,6 +345,20 @@ int dev_map_enqueue(struct bpf_dtab_netdev *dst, struct xdp_buff *xdp, return bq_enqueue(dst, xdpf, dev_rx); } +int dev_map_generic_redirect(struct bpf_dtab_netdev *dst, struct sk_buff *skb, + struct bpf_prog *xdp_prog) +{ + int err; + + err = __xdp_generic_ok_fwd_dev(skb, dst->dev); + if (unlikely(err)) + return err; + skb->dev = dst->dev; + generic_xdp_tx(skb, xdp_prog); + + return 0; +} + static void *dev_map_lookup_elem(struct bpf_map *map, void *key) { struct bpf_dtab_netdev *obj = __dev_map_lookup_elem(map, *(u32 *)key); |