Commit c0885f61 authored Apr 25, 2018 by Wang Sheng-Hui Committed by Daniel Borkmann Apr 27, 2018

samples, bpf: remove redundant ret assignment in bpf_load_program()



2 redundant ret assignments removed:

* 'ret = 1' before the logic 'if (data_maps)', and if any errors jump to
  label 'done'. No 'ret = 1' needed before the error jump.

* After the '/* load programs */' part, if everything goes well, then
  the BPF code will be loaded and 'ret' set to 0 by load_and_attach().
  If something goes wrong, 'ret' set to none-O, the redundant 'ret = 0'
  after the for clause will make the error skipped.

  For example, if some BPF code cannot provide supported program types
  in ELF SEC("unknown"), the for clause will not call load_and_attach()
  to load the BPF code. 1 should be returned to callees instead of 0.

Signed-off-by: Wang Sheng-Hui <shhuiw@foxmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent a6712d45

samples/bpf/bpf_load.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -549,7 +549,6 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map)
		if (nr_maps < 0) {
		printf("Error: Failed loading ELF maps (errno:%d):%s\n",
		nr_maps, strerror(-nr_maps));
		ret = 1;
		goto done;
		}
		if (load_maps(map_data, nr_maps, fixup_map))
		@@ -615,7 +614,6 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map)
		}
		}

		ret = 0;
		done:
		close(fd);
		return ret;

Admin message