diff options
| author | Lawrence Brakmo <brakmo@fb.com> | 2017-07-04 15:57:50 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-07-05 09:05:28 +0100 |
| commit | f856e46978b8cfaa62cf13738ebab38684b96222 (patch) | |
| tree | 5ce7b92a145c33a4d6b38d1261c7d33bc95f7e62 /samples | |
| parent | ca4a1cd930d74370cc64a8dd4491fba365986bb1 (diff) | |
| download | linux-stable-f856e46978b8cfaa62cf13738ebab38684b96222.tar.gz linux-stable-f856e46978b8cfaa62cf13738ebab38684b96222.tar.bz2 linux-stable-f856e46978b8cfaa62cf13738ebab38684b96222.zip | |
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: Lawrence Brakmo <brakmo@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/bpf_load.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/samples/bpf/bpf_load.c b/samples/bpf/bpf_load.c index a4be7cfa6519..899f40310bc3 100644 --- a/samples/bpf/bpf_load.c +++ b/samples/bpf/bpf_load.c @@ -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, "socket", 6) == 0 || memcmp(shname, "cgroup/", 7) == 0 || - memcmp(shname, "sockops", 7) == 0) - load_and_attach(shname, data->d_buf, data->d_size); + memcmp(shname, "sockops", 7) == 0) { + ret = load_and_attach(shname, data->d_buf, + data->d_size); + if (ret != 0) + goto done; + } } ret = 0; |