xdp_monitor_user: Fix null pointer dereference
Subsystems (4)
PATCH 1/1 xdp_monitor_user: Fix null pointer dereference
Memset() on the pointer right after malloc() can cause a null pointer dereference if it failed to allocate memory. Fix this by replacing malloc/memset with a single calloc().
Signed-off-by Gaurav Singh <[email protected]>
--- samples/bpf/xdp_monitor_user.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
samples/bpf/xdp_monitor_user.c +2 -6
@@ -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 );
Signature · 1 line
2.17.1
Quoted 39 lines · Gaurav Singh
Memset()on the pointer right aftermalloc()can cause a null pointer dereference if it failed to allocate memory. Fix this by replacing malloc/memset with a singlecalloc().Signed-off-by Gaurav Singh <[email protected]>--- samples/bpf/xdp_monitor_user.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)samples/bpf/xdp_monitor_user.c +2
-6@@ -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 );Signature · 1 line
2.17.1
Acked-by John Fastabend <[email protected]>