xdp_redirect_cpu_user: Fix null pointer dereference
Subsystems (4)
PATCH 1/1 xdp_redirect_cpu_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().
--- samples/bpf/xdp_redirect_cpu_user.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
samples/bpf/xdp_redirect_cpu_user.c +3 -8
@@ -207,11 +207,8 @@ static struct datarec *alloc_record_per_cpu(void) {unsigned int nr_cpus =bpf_num_possible_cpus ();struct datarec *array; -size_t size; - size =sizeof (struct datarec ) * nr_cpus; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_cpus,sizeof (struct datarec ));if (!array) {fprintf (stderr,"Mem alloc error (nr_cpus:%u)\n" , nr_cpus);exit (EXIT_FAIL_MEM );
@@ -222,11 +219,9 @@ static struct datarec *alloc_record_per_cpu(void)static struct stats_record *alloc_stats_record (void ) {struct stats_record *rec; -int i, size; +int i; - size =sizeof (*rec) + n_cpus *sizeof (struct record ); - rec =malloc (size); -memset (rec,0 , size); + rec =calloc (n_cpus +1 ,sizeof (struct record ));if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );
Signature · 1 line
2.17.1
Quoted 43 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_redirect_cpu_user.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)samples/bpf/xdp_redirect_cpu_user.c +3
-8@@ -207,11 +207,8 @@ static struct datarec *alloc_record_per_cpu(void) {unsigned int nr_cpus =bpf_num_possible_cpus ();struct datarec *array; -size_t size; - size =sizeof (struct datarec ) * nr_cpus; - array =malloc (size); -memset (array,0 , size); + array =calloc (nr_cpus,sizeof (struct datarec ));if (!array) {fprintf (stderr,"Mem alloc error (nr_cpus:%u)\n" , nr_cpus);exit (EXIT_FAIL_MEM );@@ -222,11 +219,9 @@ static struct datarec *alloc_record_per_cpu(void)static struct stats_record *alloc_stats_record (void ) {struct stats_record *rec; -int i, size; +int i; - size =sizeof (*rec) + n_cpus *sizeof (struct record ); - rec =malloc (size); -memset (rec,0 , size); + rec =calloc (n_cpus +1 ,sizeof (struct record ));if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );Signature · 1 line
2.17.1
Daniel Borkmann
maintainerQuoted 5 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]>
Squashed all three same fixes into one and pushed to bpf, thanks!
samples/bpf/xdp_redirect_cpu_user.c static struct datarec *alloc_record_per_cpu(void) · line 224
Quoted 11 lines
samples/bpf/xdp_redirect_cpu_user.c +2
-4@@ -222,11 +219,9 @@ static struct datarec *alloc_record_per_cpu(void)static struct stats_record *alloc_stats_record (void ) {struct stats_record *rec; -int i, size; +int i; - size =sizeof (*rec) + n_cpus *sizeof (struct record ); - rec =malloc (size); -memset (rec,0 , size); + rec =calloc (n_cpus +1 ,sizeof (struct record ));
For the record, this one is buggy, so I fixed it up as well.
samples/bpf/xdp_redirect_cpu_user.c static struct datarec *alloc_record_per_cpu(void) · line 227
Quoted 4 lines
samples/bpf/xdp_redirect_cpu_user.c +0
-0if (!rec) {fprintf (stderr,"Mem alloc error\n" );exit (EXIT_FAIL_MEM );
Thanks,
Daniel