userspace/tools: check pointer follow result in wrs_dump_shmem

Print error when wrs_shm_follow is not successful in wrs_dump_shmem. Avoid segfaults. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/tools: check pointer follow result in wrs_dump_shmem
Print error when wrs_shm_follow is not successful in wrs_dump_shmem. Avoid segfaults. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
f0bdc562 · Adam Wujek · e168b7f8 · f0bdc562
Commit f0bdc562 authored Jan 23, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

wrs_dump_shmem.c userspace/tools/wrs_dump_shmem.c +10 -0

No files found.
--- a/userspace/tools/wrs_dump_shmem.c
+++ b/userspace/tools/wrs_dump_shmem.c
@@ -238,6 +238,11 @@ int dump_hal_mem(struct wrs_shm_head *head)
 	n = h->nports;
 	p = wrs_shm_follow(head, h->ports);

+	if (!p) {
+		fprintf(stderr, "dump hal: cannot follow pointer to *ports\n");
+		return -1;
+	}
+
 	for (i = 0; i < n; i++, p++) {
 		printf("dump port %i\n", i);
 		dump_many_fields(p, hal_port_info, ARRAY_SIZE(hal_port_info));
@@ -300,6 +305,11 @@ int dump_rtu_mem(struct wrs_shm_head *head)
 	rtu_filters = wrs_shm_follow(head, rtu_h->filters);
 	rtu_vlans = wrs_shm_follow(head, rtu_h->vlans);

+	if ((!rtu_filters) || (!rtu_vlans)) {
+		fprintf(stderr, "dump rtu: cannot follow pointer in shm\n");
+		return -1;
+	}
+
 	for (i = 0; i < HTAB_ENTRIES; i++) {
 		for (j = 0; j < RTU_BUCKETS; j++) {
 			printf("dump htab[%d][%d]\n", i, j);