Skip to contentSkip to conversation

bpf: fix sock_map_alloc() error path

PATCH Applied Eric Dumazet 4 participants 5 messages Feb 13, 2018 – Feb 14, 2018

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

PATCH 1/1 bpf: fix sock_map_alloc() error path

From: Eric Dumazet <[email protected]>

In case user program provides silly parameters, we want a map_alloc() handler to return an error, not a NULL pointer, otherwise we crash later in find_and_alloc_map()

Fixes 174a79ff9515 ("bpf: sockmap with sk redirect support")

---
 kernel/bpf/sockmap.c |    3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/bpf/sockmap.c +2 -1
index 48c33417d13c0ad40154f25aeade0c9b4cafd96a..a927e89dad6e9591066c3a87afc497a196ebd887 100644
@@ -521,8 +521,8 @@ static struct smap_psock *smap_init_psock(struct sock *sock,
 static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
 {
 	struct bpf_stab *stab;
-	int err = -EINVAL;
 	u64 cost;
+	int err;
 
 	if (!capable(CAP_NET_ADMIN))
 		return ERR_PTR(-EPERM);
@@ -547,6 +547,7 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
 
 	/* make sure page count doesn't overflow */
 	cost = (u64) stab->map.max_entries * sizeof(struct sock *);
+	err = -EINVAL;
 	if (cost >= U32_MAX - PAGE_SIZE)
 		goto free_stab;
 
#1 lore raw
Quoted 10 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

In case user program provides silly parameters, we want a map_alloc() handler to return an error, not a NULL pointer, otherwise we crash later in find_and_alloc_map()

Fixes 174a79ff9515 ("bpf: sockmap with sk redirect support")

---

This would apply to net or bpf trees, not -next ones, sorry for the confusion in the [PATCH bpf-next] prefix.

Bug was added in 4.14

maintainer
#2 lore raw

Hi Eric,

Quoted 7 lines · Eric Dumazet
Quoted 6 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

In case user program provides silly parameters, we want a map_alloc() handler to return an error, not a NULL pointer, otherwise we crash later in find_and_alloc_map()

Quoted 7 lines
Quoted 4 lines
Fixes 174a79ff9515 ("bpf: sockmap with sk redirect support")

---

This would apply to net or bpf trees, not -next ones, sorry for the confusion in the [PATCH bpf-next] prefix.

No problem, thanks for the fix!

Quoted 1 line

Bug was added in 4.14

Fixes tag is actually slightly different, it would be:

Fixes 1aa12bdf1bfb ("bpf: sockmap, add sock close() hook to remove socks")

I can change it if you want, no need to resend.

Thanks,
Daniel

#3 lore raw
Quoted 14 lines · Daniel Borkmann

Hi Eric,

Quoted 11 lines · Eric Dumazet
Quoted 10 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

In case user program provides silly parameters, we want a map_alloc() handler to return an error, not a NULL pointer, otherwise we crash later in find_and_alloc_map()

Fixes 174a79ff9515 ("bpf: sockmap with sk redirect support")

---

Thanks Eric, also great to see syzkaller working on the sockmap types.

Quoted 4 lines
Quoted 3 lines

This would apply to net or bpf trees, not -next ones, sorry for the confusion in the [PATCH bpf-next] prefix.

Quoted 8 lines

No problem, thanks for the fix!

Quoted 1 line

Bug was added in 4.14

Fixes tag is actually slightly different, it would be:

Fixes 1aa12bdf1bfb ("bpf: sockmap, add sock close() hook to remove socks")

Yep.

Quoted 3 lines

I can change it if you want, no need to resend.> Thanks, Daniel

#4 lore raw
Quoted 27 lines · John Fastabend
Quoted 14 lines · Daniel Borkmann

Hi Eric,

Quoted 11 lines · Eric Dumazet
Quoted 10 lines · Eric Dumazet

From: Eric Dumazet <[email protected]>

In case user program provides silly parameters, we want a map_alloc() handler to return an error, not a NULL pointer, otherwise we crash later in find_and_alloc_map()

Fixes 174a79ff9515 ("bpf: sockmap with sk redirect support")

---

Thanks Eric, also great to see syzkaller working on the sockmap types.

Quoted 6 lines
Quoted 3 lines

This would apply to net or bpf trees, not -next ones, sorry for the confusion in the [PATCH bpf-next] prefix.

No problem, thanks for the fix!

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Bug was added in 4.14

Fixes tag is actually slightly different, it would be:

Fixes 1aa12bdf1bfb ("bpf: sockmap, add sock close() hook to remove socks")

Yep.

Applied to bpf tree with corrected Fixes tag, Thanks everyone.