lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf, xdp, samples: Fix null pointer dereference in *_user code

Browse Source 
[ Upstream commit 6903cdae9f9f08d61e49c16cbef11c293e33a615 ]

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: 0fca931a6f ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Gaurav Singh 2020-06-12 14:53:27 -04:00 committed by Sasha Levin
parent 0608288c6c
commit d909f9db0c
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/bpf/xdp_monitor_user.c
View File

@ -509,11 +509,8 @@ static void *alloc_rec_per_cpu(int record_size)
{ {
unsigned int nr_cpus = bpf_num_possible_cpus(); unsigned int nr_cpus = bpf_num_possible_cpus();
void *array; void *array;
size_t size;
size = record_size * nr_cpus; array = calloc(nr_cpus, record_size);
array = malloc(size);
memset(array, 0, size);
if (!array) { if (!array) {
fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus); fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus);
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);
@ -528,8 +525,7 @@ static struct stats_record *alloc_stats_record(void)
int i; int i;
/* Alloc main stats_record structure */ /* Alloc main stats_record structure */
rec = malloc(sizeof(*rec)); rec = calloc(1, sizeof(*rec));
memset(rec, 0, sizeof(*rec));
if (!rec) { if (!rec) {
fprintf(stderr, "Mem alloc error\n"); fprintf(stderr, "Mem alloc error\n");
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);

7
samples/bpf/xdp_redirect_cpu_user.c
View File

@ -210,11 +210,8 @@ static struct datarec *alloc_record_per_cpu(void)
{ {
unsigned int nr_cpus = bpf_num_possible_cpus(); unsigned int nr_cpus = bpf_num_possible_cpus();
struct datarec *array; struct datarec *array;
size_t size;
size = sizeof(struct datarec) * nr_cpus; array = calloc(nr_cpus, sizeof(struct datarec));
array = malloc(size);
memset(array, 0, size);
if (!array) { if (!array) {
fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus); fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus);
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);
@ -229,11 +226,11 @@ static struct stats_record *alloc_stats_record(void)
size = sizeof(*rec) + n_cpus * sizeof(struct record); size = sizeof(*rec) + n_cpus * sizeof(struct record);
rec = malloc(size); rec = malloc(size);
memset(rec, 0, size);
if (!rec) { if (!rec) {
fprintf(stderr, "Mem alloc error\n"); fprintf(stderr, "Mem alloc error\n");
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);
} }
memset(rec, 0, size);
rec->rx_cnt.cpu = alloc_record_per_cpu(); rec->rx_cnt.cpu = alloc_record_per_cpu();
rec->redir_err.cpu = alloc_record_per_cpu(); rec->redir_err.cpu = alloc_record_per_cpu();
rec->kthread.cpu = alloc_record_per_cpu(); rec->kthread.cpu = alloc_record_per_cpu();

13
samples/bpf/xdp_rxq_info_user.c
View File

@ -198,11 +198,8 @@ static struct datarec *alloc_record_per_cpu(void)
{ {
unsigned int nr_cpus = bpf_num_possible_cpus(); unsigned int nr_cpus = bpf_num_possible_cpus();
struct datarec *array; struct datarec *array;
size_t size;
size = sizeof(struct datarec) * nr_cpus; array = calloc(nr_cpus, sizeof(struct datarec));
array = malloc(size);
memset(array, 0, size);
if (!array) { if (!array) {
fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus); fprintf(stderr, "Mem alloc error (nr_cpus:%u)\n", nr_cpus);
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);
@ -214,11 +211,8 @@ static struct record *alloc_record_per_rxq(void)
{ {
unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries;
struct record *array; struct record *array;
size_t size;
size = sizeof(struct record) * nr_rxqs; array = calloc(nr_rxqs, sizeof(struct record));
array = malloc(size);
memset(array, 0, size);
if (!array) { if (!array) {
fprintf(stderr, "Mem alloc error (nr_rxqs:%u)\n", nr_rxqs); fprintf(stderr, "Mem alloc error (nr_rxqs:%u)\n", nr_rxqs);
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);
@ -232,8 +226,7 @@ static struct stats_record *alloc_stats_record(void)
struct stats_record *rec; struct stats_record *rec;
int i; int i;
rec = malloc(sizeof(*rec)); rec = calloc(1, sizeof(struct stats_record));
memset(rec, 0, sizeof(*rec));
if (!rec) { if (!rec) {
fprintf(stderr, "Mem alloc error\n"); fprintf(stderr, "Mem alloc error\n");
exit(EXIT_FAIL_MEM); exit(EXIT_FAIL_MEM);