Skip to contentSkip to conversation

samples: bpf: Fix uninitialized variable in xdp_redirect_cpu

PATCH New Kumar Kartikeya Dwivedi 1 participant 1 message Aug 26, 2021

Subsystems (2)
lore
Share & tools
lore

Kumar Kartikeya Dwivedi

author maintainer
#0 lore raw

PATCH 1/1 samples: bpf: Fix uninitialized variable in xdp_redirect_cpu

While at it, also improve help output when CPU number is greater than possible.

Fixes e531a220cc59 ("samples: bpf: Convert xdp_redirect_cpu to XDP samples helper")
---
 samples/bpf/xdp_redirect_cpu_user.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
samples/bpf/xdp_redirect_cpu_user.c +3 -2
index 631700aef69c..6e25fba64c72 100644
@@ -141,7 +141,7 @@ static int create_cpu_entry(__u32 cpu, struct bpf_cpumap_val *value,
 static int mark_cpus_unavailable(void)
 {
 	int ret, i, n_cpus = libbpf_num_possible_cpus();
-	__u32 invalid_cpu;
+	__u32 invalid_cpu = n_cpus;
 
 	for (i = 0; i < n_cpus; i++) {
 		ret = bpf_map_update_elem(avail_fd, &i,
@@ -449,8 +449,9 @@ int main(int argc, char **argv)
 			add_cpu = strtoul(optarg, NULL, 0);
 			if (add_cpu >= n_cpus) {
 				fprintf(stderr,
-				"--cpu nr too large for cpumap err(%d):%s\n",
+				"--cpu nr too large for cpumap err (%d):%s\n",
 					errno, strerror(errno));
+				usage(argv, long_options, __doc__, mask, true, skel->obj);
 				goto end_cpu;
 			}
 			cpu[added_cpus++] = add_cpu;
Signature · 1 line
2.33.0