|
 |
2eae47 |
From 755e4a0da3035c128d18c9a8f7d2f61f29715323 Mon Sep 17 00:00:00 2001
|
|
|
2eae47 |
From: Martin Lau <kafai@fb.com>
|
|
|
2eae47 |
Date: Thu, 3 Jan 2019 23:36:22 +0000
|
|
|
2eae47 |
Subject: [PATCH 16/27] tests: fix prog_info initialization in
|
|
|
2eae47 |
bpf-obj_get_info_by_fd-prog*
|
|
|
2eae47 |
|
|
|
2eae47 |
The sys_bpf(BPF_OBJ_GET_INFO_BY_FD, &bpf_prog_get_info_attr, ...) is
|
|
|
2eae47 |
called in a loop. The bpf_prog_get_info_attr.info object is in size 104
|
|
|
2eae47 |
but bpf_prog_get_info_attr.info_len is in size 168. Hence, if the prog
|
|
|
2eae47 |
is jited, the second iteration onwards will have nr_jited_ksyms == 1
|
|
|
2eae47 |
which is asking the kernel to fill the
|
|
|
2eae47 |
bpf_prog_get_info_attr.info.jited_ksyms and it is NULL.
|
|
|
2eae47 |
|
|
|
2eae47 |
* tests/bpf-obj_get_info_by_fd.c (main): Clear memory beyond prog_info
|
|
|
2eae47 |
at the start of every iteration.
|
|
|
2eae47 |
|
|
|
2eae47 |
Additional changes:
|
|
|
2eae47 |
tests-m32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
|
|
|
2eae47 |
tests-mx32/bpf-obj_get_info_by_fd.c (copy of tests/bpf-obj_get_info_by_fd.c)
|
|
|
2eae47 |
|
|
|
2eae47 |
Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>
|
|
|
2eae47 |
---
|
|
|
2eae47 |
tests/bpf-obj_get_info_by_fd.c | 1 +
|
|
|
2eae47 |
1 file changed, 1 insertion(+)
|
|
|
2eae47 |
|
|
|
2eae47 |
Index: strace-4.24/tests/bpf-obj_get_info_by_fd.c
|
|
|
2eae47 |
===================================================================
|
|
|
2eae47 |
--- strace-4.24.orig/tests/bpf-obj_get_info_by_fd.c 2019-03-10 05:38:07.889179571 +0100
|
|
|
2eae47 |
+++ strace-4.24/tests/bpf-obj_get_info_by_fd.c 2019-03-10 05:38:16.038097970 +0100
|
|
|
2eae47 |
@@ -345,6 +345,7 @@
|
|
|
2eae47 |
memset(prog_info, 0, PROG_INFO_SZ);
|
|
|
2eae47 |
for (unsigned int i = 0; i < 4; i++) {
|
|
|
2eae47 |
prog_info->jited_prog_len = 0;
|
|
|
2eae47 |
+ memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
|
|
|
2eae47 |
switch (i) {
|
|
|
2eae47 |
case 1:
|
|
|
2eae47 |
prog_info->xlated_prog_insns =
|
|
|
2eae47 |
Index: strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c
|
|
|
2eae47 |
===================================================================
|
|
|
2eae47 |
--- strace-4.24.orig/tests-m32/bpf-obj_get_info_by_fd.c 2019-03-10 05:35:43.934621086 +0100
|
|
|
2eae47 |
+++ strace-4.24/tests-m32/bpf-obj_get_info_by_fd.c 2019-03-10 05:38:32.161936511 +0100
|
|
|
2eae47 |
@@ -345,6 +345,7 @@
|
|
|
2eae47 |
memset(prog_info, 0, PROG_INFO_SZ);
|
|
|
2eae47 |
for (unsigned int i = 0; i < 4; i++) {
|
|
|
2eae47 |
prog_info->jited_prog_len = 0;
|
|
|
2eae47 |
+ memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
|
|
|
2eae47 |
switch (i) {
|
|
|
2eae47 |
case 1:
|
|
|
2eae47 |
prog_info->xlated_prog_insns =
|
|
|
2eae47 |
Index: strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c
|
|
|
2eae47 |
===================================================================
|
|
|
2eae47 |
--- strace-4.24.orig/tests-mx32/bpf-obj_get_info_by_fd.c 2019-03-10 05:38:12.854129853 +0100
|
|
|
2eae47 |
+++ strace-4.24/tests-mx32/bpf-obj_get_info_by_fd.c 2019-03-10 05:38:29.561962546 +0100
|
|
|
2eae47 |
@@ -345,6 +345,7 @@
|
|
|
2eae47 |
memset(prog_info, 0, PROG_INFO_SZ);
|
|
|
2eae47 |
for (unsigned int i = 0; i < 4; i++) {
|
|
|
2eae47 |
prog_info->jited_prog_len = 0;
|
|
|
2eae47 |
+ memset(prog_info + 1, 0, PROG_INFO_SZ - sizeof(*prog_info));
|
|
|
2eae47 |
switch (i) {
|
|
|
2eae47 |
case 1:
|
|
|
2eae47 |
prog_info->xlated_prog_insns =
|