| Message ID | 1578618277-18085-1-git-send-email-lirongqing@baidu.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next,v2] bpf: return -EBADRQC for invalid map type in __bpf_tx_xdp_map | expand |
On 1/10/20 2:04 AM, Li RongQing wrote: > a negative value should be returned if map->map_type > is invalid although that seems unlikely now, then the > caller will continue to handle buffer, otherwise the > buffer will be leaked > > Daniel Borkmann suggested: > -EBADRQC should be returned to keep consistent with > xdp_do_generic_redirect_map() for the tracepoint output > and not to be confused with -EOPNOTSUPP from other > locations like dev_map_enqueue() when ndo_xdp_xmit > is missing or such. > > Suggested-by: Daniel Borkmann <daniel@iogearbox.net> > Signed-off-by: Li RongQing <lirongqing@baidu.com> Applied, thanks (fixed up commit message a bit).
diff --git a/net/core/filter.c b/net/core/filter.c index 1cbac34a4e11..8769da0f56bf 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3512,7 +3512,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; }
a negative value should be returned if map->map_type is invalid although that seems unlikely now, then the caller will continue to handle buffer, otherwise the buffer will be leaked Daniel Borkmann suggested: -EBADRQC should be returned to keep consistent with xdp_do_generic_redirect_map() for the tracepoint output and not to be confused with -EOPNOTSUPP from other locations like dev_map_enqueue() when ndo_xdp_xmit is missing or such. Suggested-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Li RongQing <lirongqing@baidu.com> --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)