2015-07-24 08:30:21

by Namhyung Kim

Subject: [PATCH] samples/bpf: Fix map fd argument on tracex4 example

It only uses a map so the map_fd[1] should not be accessed. Anyway the
print_old_objects didn't use the argument, Fix it.

Signed-off-by: Namhyung Kim <[email protected]>
---
samples/bpf/tracex4_user.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/bpf/tracex4_user.c b/samples/bpf/tracex4_user.c
index bc4a3bdea6ed..269d78e4ac52 100644
--- a/samples/bpf/tracex4_user.c
+++ b/samples/bpf/tracex4_user.c
@@ -37,8 +37,8 @@ static void print_old_objects(int fd)
key = write(1, "\e[1;1H\e[2J", 12); /* clear screen */

key = -1;
- while (bpf_get_next_key(map_fd[0], &key, &next_key) == 0) {
- bpf_lookup_elem(map_fd[0], &next_key, &v);
+ while (bpf_get_next_key(fd, &key, &next_key) == 0) {
+ bpf_lookup_elem(fd, &next_key, &v);
key = next_key;
if (val - v.val < 1000000000ll)
/* object was allocated more then 1 sec ago */
@@ -61,7 +61,7 @@ int main(int ac, char **argv)
}

for (i = 0; ; i++) {
- print_old_objects(map_fd[1]);
+ print_old_objects(map_fd[0]);
sleep(1);
}

--
2.4.6

2015-07-24 16:35:23

by Alexei Starovoitov

Subject: Re: [PATCH] samples/bpf: Fix map fd argument on tracex4 example

On 7/24/15 1:27 AM, Namhyung Kim wrote:
> It only uses a map so the map_fd[1] should not be accessed. Anyway the
> print_old_objects didn't use the argument, Fix it.
>
> Signed-off-by: Namhyung Kim<[email protected]>

thanks for the fix.
Acked-by: Alexei Starovoitov <[email protected]>

the patch won't conflict with any of the work happening in net-next,
so it's fine to route it through tip.