netdev - [PATCH][bpf-next][v2] bpf: return -EBADRQC for invalid map type in __bpf_tx_xdp

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1578618277-18085-1-git-send-email-lirongqing@baidu.com>
Date:   Fri, 10 Jan 2020 09:04:37 +0800
From:   Li RongQing <lirongqing@...du.com>
To:     netdev@...r.kernel.org, songliubraving@...com,
        daniel@...earbox.net, bpf@...r.kernel.org
Subject: [PATCH][bpf-next][v2] bpf: return -EBADRQC for invalid map type in __bpf_tx_xdp_map

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@...earbox.net>
Signed-off-by: Li RongQing <lirongqing@...du.com>
---
 net/core/filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
 }
-- 
2.16.2