Skip to contentSkip to conversation

bpftool: Fix memory leak in do_build_table_cb

PATCH Superseded Miaoqian Lin 2 participants 3 messages Dec 5, 2022 – Dec 6, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bpftool: Fix memory leak in do_build_table_cb

strdup() allocates memory for path. We need to release the memory in the following error paths. Add free() to avoid memory leak.

Fixes 8f184732b60b ("bpftool: Switch to libbpf's hashmap for pinned paths of BPF objects")
---
 tools/bpf/bpftool/common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/bpf/bpftool/common.c +3 -1
index 0cdb4f711510..8a820356525e 100644
@@ -499,9 +499,11 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb,
 	if (err) {
 		p_err("failed to append entry to hashmap for ID %u, path '%s': %s",
 		      pinned_info.id, path, strerror(errno));
-		goto out_close;
+		goto out_free;
 	}
 
+out_free:
+	free(path);
 out_close:
 	close(fd);
 out_ret:
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 14 lines · Miaoqian Lin

strdup() allocates memory for path. We need to release the memory in the following error paths. Add free() to avoid memory leak.

Fixes 8f184732b60b ("bpftool: Switch to libbpf's hashmap for pinned paths of BPF objects")
---
  tools/bpf/bpftool/common.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
tools/bpf/bpftool/common.c +0 -0
index 0cdb4f711510..8a820356525e 100644

tools/bpf/bpftool/common.c static int do_build_table_cb(const char *fpath, const struct stat *sb, · line 506

Quoted 9 lines
tools/bpf/bpftool/common.c +3 -1
@@ -499,9 +499,11 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb,
  	if (err) {
  		p_err("failed to append entry to hashmap for ID %u, path '%s': %s",
  		      pinned_info.id, path, strerror(errno));
-		goto out_close;
+		goto out_free;
  	}
 
+out_free:
+	free(path);

It would be ok if you were to add the free(path) into the err condition, but here you also cause the !err to be freed which would trigger as UAF. See the hashmap_insert() where just set the pointer entry->value = <path>.. how was this tested before submission?

Quoted 4 lines
tools/bpf/bpftool/common.c +0 -0
  out_close:
  	close(fd);
  out_ret:
#2 lore raw

Hi, Daniel

Quoted 19 lines · Daniel Borkmann
Quoted 18 lines · Miaoqian Lin

strdup() allocates memory for path. We need to release the memory in the following error paths. Add free() to avoid memory leak.

Fixes 8f184732b60b ("bpftool: Switch to libbpf's hashmap for pinned paths of BPF objects")

---
  tools/bpf/bpftool/common.c | 4 +++-

  1 file changed, 3 insertions(+), 1 deletion(-)
tools/bpf/bpftool/common.c +0 -1
index 0cdb4f711510..8a820356525e 100644
@@ -499,9 +499,11 @@ static int do_build_table_cb(const char *fpath, const struct stat *sb,
       if (err) {
           p_err("failed to append entry to hashmap for ID %u, path '%s': %s",
                 pinned_info.id, path, strerror(errno));
-        goto out_close;
Quoted 9 lines
Quoted 4 lines
tools/bpf/bpftool/common.c +1 -0
+        goto out_free;
       }

  +out_free:
+    free(path);

It would be ok if you were to add the free(path) into the err condition, but here you also cause the !err to be freed which would trigger as UAF. See the hashmap_insert() where just set the pointer entry->value = <path>.. how was this tested before submission?

Thanks for your review. You're right. Sorry for the mistake, I meant to free it in the error path.

I'll send v2 to fix this. I spotted it with static detection tool.

Quoted 5 lines
Quoted 4 lines

  out_close:
      close(fd);
  out_ret: