Skip to contentSkip to conversation

bpf, sockmap: fix potential memory leak

PATCH Applied John Fastabend 4 participants 8 messages Jul 12, 2021 – Jul 15, 2021

Subsystems (5)
Networking Network drivers BPF TCP +1 more subsystems
lore
Share & tools
lore

John Fastabend

author maintainer
#0 lore raw

v4 cover bpf, sockmap: fix potential memory leak

While investigating a memleak in sockmap I found these two issues. Patch 1 found doing code review, I wasn't able to get KASAN to trigger a memleak here, but should be necessary. Patch 2 fixes proc stats so when we use sockstats for debugging we get correct values.

The fix for observered memleak will come after these, but requires some more discussion and potentially patch revert so I'll try to get the set here going now.

v4: fix both users of sk_psock_skb_ingress_enqueue and then fix the
inuse idx by moving init hook later after tcp/udp init calls.
v3: move kfree into same function as kalloc

John Fastabend (2):
bpf, sockmap: fix potential memory leak on unlikely error case bpf, sockmap: sk_prot needs inuse_idx set for proc stats

 net/core/skmsg.c    | 16 +++++++++++-----
 net/core/sock_map.c | 11 ++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH v4 1/2 bpf, sockmap: fix potential memory leak on unlikely error case

If skb_linearize is needed and fails we could leak a msg on the error handling. To fix ensure we kfree the msg block before returning error. Found during code review.

Fixes 4363023d2668e ("bpf, sockmap: Avoid failures from skb_to_sgvec when skb has frag_list")
---
 net/core/skmsg.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
net/core/skmsg.c +11 -5
index 9b6160a191f8..15d71288e741 100644
@@ -508,10 +508,8 @@ static int sk_psock_skb_ingress_enqueue(struct sk_buff *skb,
 	if (skb_linearize(skb))
 		return -EAGAIN;
 	num_sge = skb_to_sgvec(skb, msg->sg.data, 0, skb->len);
-	if (unlikely(num_sge < 0)) {
-		kfree(msg);
+	if (unlikely(num_sge < 0))
 		return num_sge;
-	}
 
 	copied = skb->len;
 	msg->sg.start = 0;
@@ -530,6 +528,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb)
 {
 	struct sock *sk = psock->sk;
 	struct sk_msg *msg;
+	int err;
 
 	/* If we are receiving on the same sock skb->sk is already assigned,
 	 * skip memory accounting and owner transition seeing it already set
@@ -548,7 +547,10 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb)
 	 * into user buffers.
 	 */
 	skb_set_owner_r(skb, sk);
-	return sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
+	err = sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
+	if (err < 0)
+		kfree(msg);
+	return err;
 }
 
 /* Puts an skb on the ingress queue of the socket already assigned to the
@@ -559,12 +561,16 @@ static int sk_psock_skb_ingress_self(struct sk_psock *psock, struct sk_buff *skb
 {
 	struct sk_msg *msg = kzalloc(sizeof(*msg), __GFP_NOWARN | GFP_ATOMIC);
 	struct sock *sk = psock->sk;
+	int err;
 
 	if (unlikely(!msg))
 		return -EAGAIN;
 	sk_msg_init(msg);
 	skb_set_owner_r(skb, sk);
-	return sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
+	err = sk_psock_skb_ingress_enqueue(skb, psock, sk, msg);
+	if (err < 0)
+		kfree(msg);
+	return err;
 }
 
 static int sk_psock_handle_skb(struct sk_psock *psock, struct sk_buff *skb,
Signature · 1 line
2.25.1
Reviewed-by on v4 1/2
#2 lore raw

Re: [PATCH bpf v4 1/2] bpf, sockmap: fix potential memory leak on unlikely error case

Quoted 7 lines · John Fastabend

If skb_linearize is needed and fails we could leak a msg on the error handling. To fix ensure we kfree the msg block before returning error. Found during code review.

Fixes 4363023d2668e ("bpf, sockmap: Avoid failures from skb_to_sgvec when skb has frag_list")

Thanks for the update.

author maintainer
#3 lore raw

PATCH v4 2/2 bpf, sockmap: sk_prot needs inuse_idx set for proc stats

In reply to John Fastabend

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

To get the correct inuse_idx value move the core_initcall that initializes the tcp/udp proto handlers to late_initcall. This way it is initialized after TCP/UDP has the chance to assign the inuse_idx value from the register protocol handler.

Fixes 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")
---
 net/ipv4/tcp_bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +1 -1
index f26916a62f25..d3e9386b493e 100644
@@ -503,7 +503,7 @@ static int __init tcp_bpf_v4_build_proto(void)
 	tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV4], &tcp_prot);
 	return 0;
 }
-core_initcall(tcp_bpf_v4_build_proto);
+late_initcall(tcp_bpf_v4_build_proto);
 
 static int tcp_bpf_assert_proto_ops(struct proto *ops)
 {
Signature · 1 line
2.25.1
maintainer
#4 lore raw

Re: [PATCH bpf v4 2/2] bpf, sockmap: sk_prot needs inuse_idx set for proc stats

Quoted 23 lines · John Fastabend

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

To get the correct inuse_idx value move the core_initcall that initializes the tcp/udp proto handlers to late_initcall. This way it is initialized after TCP/UDP has the chance to assign the inuse_idx value from the register protocol handler.

Fixes 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")
---
 net/ipv4/tcp_bpf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp_bpf.c +0 -0
index f26916a62f25..d3e9386b493e 100644

net/ipv4/tcp_bpf.c static int __init tcp_bpf_v4_build_proto(void) · line 509

Quoted 8 lines
net/ipv4/tcp_bpf.c +1 -1
@@ -503,7 +503,7 @@ static int __init tcp_bpf_v4_build_proto(void)
 	tcp_bpf_rebuild_protos(tcp_bpf_prots[TCP_BPF_IPV4], &tcp_prot);
 	return 0;
 }
-core_initcall(tcp_bpf_v4_build_proto);
+late_initcall(tcp_bpf_v4_build_proto);
 
 static int tcp_bpf_assert_proto_ops(struct proto *ops)
 {

Respective change for udp_bpf is missing. I've posted it separately [1] to save us an iteration. Hope you don't mind.

[1] https://lore.kernel.org/bpf/[email protected]/

Reviewed-by on v4 2/2
#5 lore raw

Re: [PATCH bpf v4 2/2] bpf, sockmap: sk_prot needs inuse_idx set for proc stats

In reply to John Fastabend
Quoted 7 lines · John Fastabend

Proc socket stats use sk_prot->inuse_idx value to record inuse sock stats. We currently do not set this correctly from sockmap side. The result is reading sock stats '/proc/net/sockstat' gives incorrect values. The socket counter is incremented correctly, but because we don't set the counter correctly when we replace sk_prot we may omit the decrement.

Quoted 8 lines

To get the correct inuse_idx value move the core_initcall that initializes the tcp/udp proto handlers to late_initcall. This way it is initialized after TCP/UDP has the chance to assign the inuse_idx value from the register protocol handler.

Fixes 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")

For IPv6, I think the module is always loaded before we can trigger tcp_bpf_check_v6_needs_rebuild(). So,

Thanks.

maintainer Acked-by on the v4 series
#6 lore raw
In reply to John Fastabend
Quoted 13 lines · John Fastabend

While investigating a memleak in sockmap I found these two issues. Patch 1 found doing code review, I wasn't able to get KASAN to trigger a memleak here, but should be necessary. Patch 2 fixes proc stats so when we use sockstats for debugging we get correct values.

The fix for observered memleak will come after these, but requires some more discussion and potentially patch revert so I'll try to get the set here going now.

v4: fix both users of sk_psock_skb_ingress_enqueue and then fix the
inuse idx by moving init hook later after tcp/udp init calls.
v3: move kfree into same function as kalloc

Quoted 7 lines

John Fastabend (2):
bpf, sockmap: fix potential memory leak on unlikely error case bpf, sockmap: sk_prot needs inuse_idx set for proc stats

 net/core/skmsg.c    | 16 +++++++++++-----
 net/core/sock_map.c | 11 ++++++++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

For the series:

#7 lore raw
In reply to John Fastabend
This series was applied to bpf/bpf.git (refs/heads/master):

Hello:

This series was applied to bpf/bpf.git (refs/heads/master):

Quoted 10 lines · On Mon, 12 Jul 2021 12:55:44 -0700 you wrote:

While investigating a memleak in sockmap I found these two issues. Patch 1 found doing code review, I wasn't able to get KASAN to trigger a memleak here, but should be necessary. Patch 2 fixes proc stats so when we use sockstats for debugging we get correct values.

The fix for observered memleak will come after these, but requires some more discussion and potentially patch revert so I'll try to get the set here going now.

[...]

Here is the summary with links:
- [bpf,v4,1/2] bpf, sockmap: fix potential memory leak on unlikely error case

    https://git.kernel.org/bpf/bpf/c/7e6b27a69167
  - [bpf,v4,2/2] bpf, sockmap: sk_prot needs inuse_idx set for proc stats
    https://git.kernel.org/bpf/bpf/c/228a4a7ba8e9

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