linux-kernel - [PATCH 3/4] tools: bpftool: fix potential NULL pointer dereference in do

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 for Android: free password hash cracker in your pocket

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

Message-Id: <1542786192-19164-1-git-send-email-wen.yang99@zte.com.cn>
Date:   Wed, 21 Nov 2018 15:43:12 +0800
From:   Wen Yang <wen.yang99@....com.cn>
To:     ast@...nel.org
Cc:     daniel@...earbox.net, jakub.kicinski@...ronome.com,
        quentin.monnet@...ronome.com, jiong.wang@...ronome.com,
        guro@...com, sandipan@...ux.vnet.ibm.com, john.fastabend@...il.com,
        netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
        zhong.weidong@....com.cn, wang.yi59@....com.cn,
        Wen Yang <wen.yang99@....com.cn>,
        Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH 3/4] tools: bpftool: fix potential NULL pointer dereference in do_load

This patch fixes a possible null pointer dereference in
do_load, detected by the semantic patch
deref_null.cocci, with the following warning:

./tools/bpf/bpftool/prog.c:1021:23-25: ERROR: map_replace is NULL but dereferenced.

The following code has potential null pointer references:
 881             map_replace = reallocarray(map_replace, old_map_fds + 1,
 882                                        sizeof(*map_replace));
 883             if (!map_replace) {
 884                     p_err("mem alloc failed");
 885                     goto err_free_reuse_maps;
 886             }

...
1019 err_free_reuse_maps:
1020         for (i = 0; i < old_map_fds; i++)
1021                 close(map_replace[i].fd);
1022         free(map_replace);

Signed-off-by: Wen Yang <wen.yang99@....com.cn>
Reviewed-by: Tan Hu <tan.hu@....com.cn>
CC: Julia Lawall <julia.lawall@...6.fr>
---
 tools/bpf/bpftool/prog.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 5302ee2..de42187 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1017,8 +1017,9 @@ static int do_load(int argc, char **argv)
 err_close_obj:
 	bpf_object__close(obj);
 err_free_reuse_maps:
-	for (i = 0; i < old_map_fds; i++)
-		close(map_replace[i].fd);
+	if (map_replace)
+		for (i = 0; i < old_map_fds; i++)
+			close(map_replace[i].fd);
 	free(map_replace);
 	return -1;
 }
-- 
2.9.5