Skip to contentSkip to conversation

xdp_redirect_cpu_user: Fix null pointer dereference

PATCH In review Gaurav Singh 3 participants 3 messages Jun 14, 2020 – Jun 16, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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
index f3468168982e..2ae7a9a1d950 100644
@@ -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
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 43 lines · Gaurav Singh

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
index f3468168982e..2ae7a9a1d950 100644
@@ -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
maintainer
#2 lore raw
In reply to Gaurav Singh
Quoted 5 lines · Gaurav Singh

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().

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 -0
  	if (!rec) {
  		fprintf(stderr, "Mem alloc error\n");
  		exit(EXIT_FAIL_MEM);

Thanks,
Daniel