Skip to contentSkip to conversation

net: sockmap: Don't call bpf_prog_put() on NULL pointer

PATCH Applied Alex Dewar 4 participants 7 messages Oct 12, 2020 – Oct 15, 2020

Subsystems (5)
lore
Share & tools
lore

Alex Dewar

author
#0 lore raw

PATCH 1/1 net: sockmap: Don't call bpf_prog_put() on NULL pointer

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")
---
 net/core/sock_map.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
net/core/sock_map.c +9 -7
index df09c39a4dd2..a73ccce54423 100644
@@ -238,17 +238,18 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
 	int ret;
 
 	skb_verdict = READ_ONCE(progs->skb_verdict);
-	skb_parser = READ_ONCE(progs->skb_parser);
 	if (skb_verdict) {
 		skb_verdict = bpf_prog_inc_not_zero(skb_verdict);
 		if (IS_ERR(skb_verdict))
 			return PTR_ERR(skb_verdict);
 	}
+
+	skb_parser = READ_ONCE(progs->skb_parser);
 	if (skb_parser) {
 		skb_parser = bpf_prog_inc_not_zero(skb_parser);
 		if (IS_ERR(skb_parser)) {
-			bpf_prog_put(skb_verdict);
-			return PTR_ERR(skb_parser);
+			ret = PTR_ERR(skb_parser);
+			goto out_put_skb_verdict;
 		}
 	}
 
@@ -257,7 +258,7 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
 		msg_parser = bpf_prog_inc_not_zero(msg_parser);
 		if (IS_ERR(msg_parser)) {
 			ret = PTR_ERR(msg_parser);
-			goto out;
+			goto out_put_skb_parser;
 		}
 	}
 
@@ -311,11 +312,12 @@ static int sock_map_link(struct bpf_map *map, struct sk_psock_progs *progs,
 out_progs:
 	if (msg_parser)
 		bpf_prog_put(msg_parser);
-out:
-	if (skb_verdict)
-		bpf_prog_put(skb_verdict);
+out_put_skb_parser:
 	if (skb_parser)
 		bpf_prog_put(skb_parser);
+out_put_skb_verdict:
+	if (skb_verdict)
+		bpf_prog_put(skb_verdict);
 	return ret;
 }
 
Signature · 1 line
2.28.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Alex Dewar

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")

---

maintainer Acked-by
#2 lore raw
Quoted 11 lines · Jakub Sitnicki
Quoted 8 lines · Alex Dewar

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")

---

Thanks.

Jakub, any opinions on if we should just throw an error if users try to add a sock to a map with a parser but no verdict? At the moment we fall through and add the socket, but it wont do any receive parsing/verdict. At the moment I think its fine with above fix. The useful cases for RX are parser+verdict, verdict, and empty. Where empty is just used for redirects or other socket account tricks. Just something to keep in mind.

maintainer
#3 lore raw

On Thu, Oct 15, 2020 at 06:43 AM CEST, John Fastabend wrote:

[...]

Quoted 6 lines

Jakub, any opinions on if we should just throw an error if users try to add a sock to a map with a parser but no verdict? At the moment we fall through and add the socket, but it wont do any receive parsing/verdict. At the moment I think its fine with above fix. The useful cases for RX are parser+verdict, verdict, and empty. Where empty is just used for redirects or other socket account tricks. Just something to keep in mind.

IMO we should not fail because map updates can interleave with sk_skb prog attachments, like so:

	update_map(map_fd, sock_fd);
	attach_prog(parser_fd, map_fd, BPF_SK_SKB_STREAM_PARSER);
	update_map(map_fd, sock_fd); // OK
	attach_prog(verdict_fd, map_fd, BPF_SK_SKB_STREAM_VERDICT);
	update_map(map_fd, sock_fd);

In practice, I would expect one process/thread to attach the programs, while another is allowed to update the map at the same time.

maintainer
#4 lore raw
In reply to Alex Dewar
Quoted 8 lines · Alex Dewar

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")

---

Note to maintainers: the issue exists only in bpf-next where we have:

https://lore.kernel.org/bpf/160239294756.8495.5796595770890272219.stgit@john-Precision-5820-Tower/

The patch also looks like it is supposed to be applied on top of the above.

author
#5 lore raw
Quoted 9 lines · Jakub Sitnicki
Quoted 8 lines · Alex Dewar

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")

---

Quoted 5 lines

Note to maintainers: the issue exists only in bpf-next where we have:

   https://lore.kernel.org/bpf/160239294756.8495.5796595770890272219.stgit@john-Precision-5820-Tower/

The patch also looks like it is supposed to be applied on top of the above.

Yes, the patch is based on linux-next.

#6 lore raw
In reply to Alex Dewar
This patch was applied to bpf/bpf-next.git (refs/heads/master):

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

Quoted 9 lines · On Mon, 12 Oct 2020 18:09:53 +0100 you wrote:

If bpf_prog_inc_not_zero() fails for skb_parser, then bpf_prog_put() is called unconditionally on skb_verdict, even though it may be NULL. Fix and tidy up error path.

Addresses-Coverity-ID: 1497799: Null pointer dereferences (FORWARD_NULL)

Fixes 743df8b7749f ("bpf, sockmap: Check skb_verdict and skb_parser programs explicitly")

[...]

Here is the summary with links:
- net: sockmap: Don't call bpf_prog_put() on NULL pointer

    https://git.kernel.org/bpf/bpf-next/c/83c11c17553c

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html