* [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
@ 2017-07-22 7:40 ` Dan Carpenter
0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2017-07-22 7:40 UTC (permalink / raw)
To: Alexei Starovoitov, John Fastabend
Cc: Daniel Borkmann, netdev, kernel-janitors
We forgot to set the error code on two error paths which means that we
return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
not expecting that and will have a NULL dereference.
Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
index 899364d097f5..d439ee0eadb1 100644
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -114,6 +114,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
if (err)
goto free_dtab;
+ err = -ENOMEM;
/* A per cpu bitfield with a bit per possible net device */
dtab->flush_needed = __alloc_percpu(
BITS_TO_LONGS(attr->max_entries) *
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
2017-07-22 7:40 ` Dan Carpenter
@ 2017-07-22 10:09 ` Daniel Borkmann
-1 siblings, 0 replies; 8+ messages in thread
From: Daniel Borkmann @ 2017-07-22 10:09 UTC (permalink / raw)
To: Dan Carpenter, Alexei Starovoitov, John Fastabend; +Cc: netdev, kernel-janitors
On 07/22/2017 09:40 AM, Dan Carpenter wrote:
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks!
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
@ 2017-07-22 10:09 ` Daniel Borkmann
0 siblings, 0 replies; 8+ messages in thread
From: Daniel Borkmann @ 2017-07-22 10:09 UTC (permalink / raw)
To: Dan Carpenter, Alexei Starovoitov, John Fastabend; +Cc: netdev, kernel-janitors
On 07/22/2017 09:40 AM, Dan Carpenter wrote:
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks!
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
2017-07-22 7:40 ` Dan Carpenter
@ 2017-07-22 19:07 ` John Fastabend
-1 siblings, 0 replies; 8+ messages in thread
From: John Fastabend @ 2017-07-22 19:07 UTC (permalink / raw)
To: Dan Carpenter, Alexei Starovoitov
Cc: Daniel Borkmann, netdev, kernel-janitors
On 07/22/2017 12:40 AM, Dan Carpenter wrote:
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
> index 899364d097f5..d439ee0eadb1 100644
> --- a/kernel/bpf/devmap.c
> +++ b/kernel/bpf/devmap.c
> @@ -114,6 +114,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
> if (err)
> goto free_dtab;
>
> + err = -ENOMEM;
> /* A per cpu bitfield with a bit per possible net device */
> dtab->flush_needed = __alloc_percpu(
> BITS_TO_LONGS(attr->max_entries) *
>
Thanks.
Acked-by: John Fastabend <john.fastabend@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
@ 2017-07-22 19:07 ` John Fastabend
0 siblings, 0 replies; 8+ messages in thread
From: John Fastabend @ 2017-07-22 19:07 UTC (permalink / raw)
To: Dan Carpenter, Alexei Starovoitov
Cc: Daniel Borkmann, netdev, kernel-janitors
On 07/22/2017 12:40 AM, Dan Carpenter wrote:
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c
> index 899364d097f5..d439ee0eadb1 100644
> --- a/kernel/bpf/devmap.c
> +++ b/kernel/bpf/devmap.c
> @@ -114,6 +114,7 @@ static struct bpf_map *dev_map_alloc(union bpf_attr *attr)
> if (err)
> goto free_dtab;
>
> + err = -ENOMEM;
> /* A per cpu bitfield with a bit per possible net device */
> dtab->flush_needed = __alloc_percpu(
> BITS_TO_LONGS(attr->max_entries) *
>
Thanks.
Acked-by: John Fastabend <john.fastabend@gmail.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
2017-07-22 7:40 ` Dan Carpenter
@ 2017-07-24 23:23 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-07-24 23:23 UTC (permalink / raw)
To: dan.carpenter; +Cc: ast, john.fastabend, daniel, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 22 Jul 2017 10:40:04 +0300
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH net-next] bpf: dev_map_alloc() shouldn't return NULL
@ 2017-07-24 23:23 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-07-24 23:23 UTC (permalink / raw)
To: dan.carpenter; +Cc: ast, john.fastabend, daniel, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 22 Jul 2017 10:40:04 +0300
> We forgot to set the error code on two error paths which means that we
> return ERR_PTR(0) which is NULL. The caller, find_and_alloc_map(), is
> not expecting that and will have a NULL dereference.
>
> Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 8+ messages in thread