netdev - [PATCH bpf-next v2 1/2] bpf: Change error code when ops is NULL

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-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 23 Apr 2020 11:33:13 +0800
From:   Mao Wenan <maowenan@...wei.com>
To:     <ast@...nel.org>, <daniel@...earbox.net>, <kafai@...com>,
        <songliubraving@...com>, <yhs@...com>, <andriin@...com>,
        <john.fastabend@...il.com>, <kpsingh@...omium.org>
CC:     <netdev@...r.kernel.org>, <bpf@...r.kernel.org>,
        <kernel-janitors@...r.kernel.org>, <dan.carpenter@...cle.com>,
        <andrii.nakryiko@...il.com>
Subject: [PATCH bpf-next v2 1/2] bpf: Change error code when ops is NULL

There is one error printed when use BPF_MAP_TYPE_SOCKMAP to create map:
libbpf: failed to create map (name: 'sock_map'): Invalid argument(-22)

This is because CONFIG_BPF_STREAM_PARSER is not set, and
bpf_map_types[type] return invalid ops. It is not clear to show the
cause of config missing with return code -EINVAL, so add pr_warn() and
change error code to describe the reason.

Signed-off-by: Mao Wenan <maowenan@...wei.com>
---
 kernel/bpf/syscall.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index d85f37239540..7686778457c7 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -112,9 +112,10 @@ static struct bpf_map *find_and_alloc_map(union bpf_attr *attr)
 		return ERR_PTR(-EINVAL);
 	type = array_index_nospec(type, ARRAY_SIZE(bpf_map_types));
 	ops = bpf_map_types[type];
-	if (!ops)
-		return ERR_PTR(-EINVAL);
-
+	if (!ops) {
+		pr_warn("map type %d not supported or kernel config not opened\n", type);
+		return ERR_PTR(-EOPNOTSUPP);
+	}
 	if (ops->map_alloc_check) {
 		err = ops->map_alloc_check(attr);
 		if (err)
-- 
2.20.1