bpf: Return -EBADRQC for invalid map type in __bpf_tx_xdp_map
authorLi RongQing <lirongqing@baidu.com>
Fri, 10 Jan 2020 01:04:37 +0000 (09:04 +0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 14 Jan 2020 19:32:24 +0000 (20:32 +0100)
A negative value should be returned if map->map_type is invalid
although that is impossible now, but if we run into such situation
in future, then xdpbuff could be leaked.

Daniel Borkmann suggested:

-EBADRQC should be returned to stay consistent with generic XDP
for the tracepoint output and not to be confused with -EOPNOTSUPP
from other locations like dev_map_enqueue() when ndo_xdp_xmit is
missing and such.

Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/1578618277-18085-1-git-send-email-lirongqing@baidu.com
net/core/filter.c

index a702761..d6f58dc 100644 (file)
@@ -3522,7 +3522,7 @@ static int __bpf_tx_xdp_map(struct net_device *dev_rx, void *fwd,
        case BPF_MAP_TYPE_XSKMAP:
                return __xsk_map_redirect(fwd, xdp);
        default:
-               break;
+               return -EBADRQC;
        }
        return 0;
 }