public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Wen Yang <wen.yang99@zte.com.cn>
To: ast@kernel.org
Cc: daniel@iogearbox.net, jakub.kicinski@netronome.com,
	quentin.monnet@netronome.com, jiong.wang@netronome.com,
	guro@fb.com, sandipan@linux.vnet.ibm.com,
	john.fastabend@gmail.com, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org, zhong.weidong@zte.com.cn,
	wang.yi59@zte.com.cn, Wen Yang <wen.yang99@zte.com.cn>,
	Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH 3/4] tools: bpftool: fix potential NULL pointer dereference in do_load
Date: Wed, 21 Nov 2018 15:43:12 +0800	[thread overview]
Message-ID: <1542786192-19164-1-git-send-email-wen.yang99@zte.com.cn> (raw)

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@zte.com.cn>
Reviewed-by: Tan Hu <tan.hu@zte.com.cn>
CC: Julia Lawall <julia.lawall@lip6.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

             reply	other threads:[~2018-11-21  7:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-21  7:43 Wen Yang [this message]
2018-11-21 16:58 ` [PATCH 3/4] tools: bpftool: fix potential NULL pointer dereference in do_load Jakub Kicinski
2018-11-21 17:18 ` Y Song
2018-11-21 17:30   ` Jakub Kicinski
2018-11-21 17:45     ` Y Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1542786192-19164-1-git-send-email-wen.yang99@zte.com.cn \
    --to=wen.yang99@zte.com.cn \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=guro@fb.com \
    --cc=jakub.kicinski@netronome.com \
    --cc=jiong.wang@netronome.com \
    --cc=john.fastabend@gmail.com \
    --cc=julia.lawall@lip6.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=quentin.monnet@netronome.com \
    --cc=sandipan@linux.vnet.ibm.com \
    --cc=wang.yi59@zte.com.cn \
    --cc=zhong.weidong@zte.com.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox