summaryrefslogtreecommitdiff
path: root/samples/bpf/xdp_monitor_user.c
diff options
context:
space:
mode:
authorGaurav Singh <gaurav1086@gmail.com>2020-06-12 21:53:27 +0300
committerDaniel Borkmann <daniel@iogearbox.net>2020-06-16 15:55:35 +0300
commit6903cdae9f9f08d61e49c16cbef11c293e33a615 (patch)
tree45ae1c002cf32dd421cb5dce9223d9d3b495086c /samples/bpf/xdp_monitor_user.c
parentc34a06c56df7c513cd19f591b26fe7d814c778cc (diff)
downloadlinux-6903cdae9f9f08d61e49c16cbef11c293e33a615.tar.xz
bpf, xdp, samples: Fix null pointer dereference in *_user code
Memset on the pointer right after malloc can cause a NULL pointer deference if it failed to allocate memory. A simple fix is to replace malloc()/memset() pair with a simple call to calloc(). Fixes: 0fca931a6f21 ("samples/bpf: program demonstrating access to xdp_rxq_info") Signed-off-by: Gaurav Singh <gaurav1086@gmail.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Acked-by: John Fastabend <john.fastabend@gmail.com>
Diffstat (limited to 'samples/bpf/xdp_monitor_user.c')
-rw-r--r--samples/bpf/xdp_monitor_user.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/samples/bpf/xdp_monitor_user.c b/samples/bpf/xdp_monitor_user.c
index dd558cbb2309..ef53b93db573 100644
--- a/samples/bpf/xdp_monitor_user.c
+++ b/samples/bpf/xdp_monitor_user.c
@@ -509,11 +509,8 @@ static void *alloc_rec_per_cpu(int record_size)
{
unsigned int nr_cpus = bpf_num_possible_cpus();
void *array;
- size_t size;
- size = record_size * nr_cpus;
- array = malloc(size);
- memset(array, 0, size);
+ array = calloc(nr_cpus, record_size);
if (!array) {
fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus);
exit(EXIT_FAIL_MEM);
@@ -528,8 +525,7 @@ static struct stats_record *alloc_stats_record(void)
int i;
/* Alloc main stats_record structure */
- rec = malloc(sizeof(*rec));
- memset(rec, 0, sizeof(*rec));
+ rec = calloc(1, sizeof(*rec));
if (!rec) {
fprintf(stderr, "Mem alloc error\n");
exit(EXIT_FAIL_MEM);