Commit f856e469 authored by Lawrence Brakmo's avatar Lawrence Brakmo Committed by David S. Miller

bpf: fix return in load_bpf_file

The function load_bpf_file ignores the return value of
load_and_attach(), so even if load_and_attach() returns an error,
load_bpf_file() will return 0.

Now, load_bpf_file() can call load_and_attach() multiple times and some
can succeed and some could fail. I think the correct behavor is to
return error on the first failed load_and_attach().

v2: Added missing SOB
Signed-off-by: default avatarLawrence Brakmo <brakmo@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca4a1cd9
...@@ -567,8 +567,12 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map) ...@@ -567,8 +567,12 @@ static int do_load_bpf_file(const char *path, fixup_map_cb fixup_map)
memcmp(shname, "perf_event", 10) == 0 || memcmp(shname, "perf_event", 10) == 0 ||
memcmp(shname, "socket", 6) == 0 || memcmp(shname, "socket", 6) == 0 ||
memcmp(shname, "cgroup/", 7) == 0 || memcmp(shname, "cgroup/", 7) == 0 ||
memcmp(shname, "sockops", 7) == 0) memcmp(shname, "sockops", 7) == 0) {
load_and_attach(shname, data->d_buf, data->d_size); ret = load_and_attach(shname, data->d_buf,
data->d_size);
if (ret != 0)
goto done;
}
} }
ret = 0; ret = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment