net: skb: check the boundrary of skb drop reason
Subsystems (4)
v3 cover net: skb: check the boundrary of skb drop reason
From: Menglong Dong <[email protected]>
In the commit 1330b6ef3313 ("skb: make drop reason booleanable"), SKB_NOT_DROPPED_YET is added to the enum skb_drop_reason, which makes the invalid drop reason SKB_NOT_DROPPED_YET can leak to the kfree_skb tracepoint. Once this happen (it happened, as 4th patch says), it can cause NULL pointer in drop monitor and result in kernel panic.
Therefore, check the boundrary of drop reason in both kfree_skb_reason (2th patch) and drop monitor (1th patch) to prevent such case happens again.
Meanwhile, fix the invalid drop reason passed to kfree_skb_reason() in tcp_v4_rcv() and tcp_v6_rcv().
Changes since v2:
1/4 - don't reset the reason and print the debug warning only (Jakub
Kicinski)
4/4 - remove new lines between tags
Changes since v1:
- consider tcp_v6_rcv() in the 4th patch
Menglong Dong (4):
net: dm: check the boundary of skb drop reasons
net: skb: check the boundrary of drop reason in kfree_skb_reason()
net: skb: change the definition SKB_DR_SET()
net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
include/linux/skbuff.h | 3 ++- net/core/drop_monitor.c | 2 +- net/core/skbuff.c | 2 ++ net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + 5 files changed, 7 insertions(+), 2 deletions(-)
Signature · 1 line
2.36.1
PATCH v3 1/4 net: dm: check the boundary of skb drop reasons
From: Menglong Dong <[email protected]>
The 'reason' will be set to 'SKB_DROP_REASON_NOT_SPECIFIED' if it not small that SKB_DROP_REASON_MAX in net_dm_packet_trace_kfree_skb_hit(), but it can't avoid it to be 0, which is invalid and can cause NULL pointer in drop_reasons.
Therefore, reset it to SKB_DROP_REASON_NOT_SPECIFIED when 'reason <= 0'.
--- net/core/drop_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/drop_monitor.c +1 -1
@@ -517,7 +517,7 @@ static void net_dm_packet_trace_kfree_skb_hit(void *ignore,if (!nskb)return ; -if ((unsigned int )reason >=SKB_DROP_REASON_MAX ) +if (unlikely (reason >=SKB_DROP_REASON_MAX || reason <=0 )) reason =SKB_DROP_REASON_NOT_SPECIFIED ; cb =NET_DM_SKB_CB (nskb); cb->reason = reason;
Signature · 1 line
2.36.1
PATCH v3 2/4 net: skb: check the boundrary of drop reason in kfree_skb_reason()
In reply to [email protected]From: Menglong Dong <[email protected]>
Sometimes, we may forget to reset skb drop reason to NOT_SPECIFIED after we make it the return value of the functions with return type of enum skb_drop_reason, such as tcp_inbound_md5_hash. Therefore, its value can be SKB_NOT_DROPPED_YET(0), which is invalid for kfree_skb_reason().
So we check the range of drop reason in kfree_skb_reason() with DEBUG_NET_WARN_ON_ONCE().
---
v3:
- don't reset the reason and print the debug warning only (Jakub Kicinski)
--- net/core/skbuff.c | 2 ++ 1 file changed, 2 insertions(+)
net/core/skbuff.c +2 -0
@@ -771,6 +771,8 @@ void kfree_skb_reason(struct sk_buff *skb, enum skb_drop_reason reason)if (!skb_unref (skb))return ; +DEBUG_NET_WARN_ON_ONCE (reason <=0 || reason >=SKB_DROP_REASON_MAX ); +trace_kfree_skb (skb,__builtin_return_address (0 ), reason);__kfree_skb (skb); }
Signature · 1 line
2.36.1
PATCH v3 3/4 net: skb: change the definition SKB_DR_SET()
In reply to [email protected]From: Menglong Dong <[email protected]>
The SKB_DR_OR() is used to set the drop reason to a value when it is not set or specified yet. SKB_NOT_DROPPED_YET should also be considered as not set.
--- include/linux/skbuff.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/skbuff.h +2 -1
@@ -510,7 +510,8 @@ enum skb_drop_reason { (name = SKB_DROP_REASON_##reason)#define SKB_DR_OR (name, reason) \ do { \ - if (name == SKB_DROP_REASON_NOT_SPECIFIED) \ + if (name == SKB_DROP_REASON_NOT_SPECIFIED || \ + name == SKB_NOT_DROPPED_YET) \ SKB_DR_SET(name, reason); \ } while (0)
Signature · 1 line
2.36.1
PATCH v3 4/4 net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
In reply to [email protected]From: Menglong Dong <[email protected]>
The 'drop_reason' that passed to kfree_skb_reason() in tcp_v4_rcv() and tcp_v6_rcv() can be SKB_NOT_DROPPED_YET(0), as it is used as the return value of tcp_inbound_md5_hash().
And it can panic the kernel with NULL pointer in net_dm_packet_report_size() if the reason is 0, as drop_reasons[0] is NULL.
---
v3:
- remove new lines between tags
v2:
- consider tcp_v6_rcv()
--- net/ipv4/tcp_ipv4.c | 1 + net/ipv6/tcp_ipv6.c | 1 + 2 files changed, 2 insertions(+)
net/ipv4/tcp_ipv4.c +1 -0
@@ -2101,6 +2101,7 @@ int tcp_v4_rcv(struct sk_buff *skb) } discard_it: +SKB_DR_OR (drop_reason,NOT_SPECIFIED );/* Discard frame. */ kfree_skb_reason (skb, drop_reason);return 0 ;
net/ipv6/tcp_ipv6.c +1 -0
@@ -1509,6 +1509,7 @@ int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) discard:if (opt_skb)__kfree_skb (opt_skb); +SKB_DR_OR (reason,NOT_SPECIFIED );kfree_skb_reason (skb, reason);return 0 ; csum_err:
Signature · 1 line
2.36.1
Jakub Kicinski
maintainerRe: [PATCH net-next v3 4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
Quoted 11 lines · On Fri, 13 May 2022 11:03:39 +0800 [email protected] wrote:
From: Menglong Dong <[email protected]>
The '
drop_reason' that passed tokfree_skb_reason()intcp_v4_rcv()andtcp_v6_rcv()can beSKB_NOT_DROPPED_YET(0), as it is used as the return value oftcp_inbound_md5_hash().And it can panic the kernel with NULL pointer in
net_dm_packet_report_size()if the reason is 0, as drop_reasons[0] is NULL.Fixes 1330b6ef3313 ("skb: make drop reason booleanable")
This patch is in net, should this fix have been targeting net / 5.18?
Re: [PATCH net-next v3 4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
Quoted 8 lines · Jakub Kicinski
Quoted 6 lines · On Fri, 13 May 2022 11:03:39 +0800 [email protected] wrote:
From: Menglong Dong <[email protected]>
The '
drop_reason' that passed tokfree_skb_reason()intcp_v4_rcv()andtcp_v6_rcv()can beSKB_NOT_DROPPED_YET(0), as it is used as the return value oftcp_inbound_md5_hash().
Quoted 7 lines
Quoted 5 lines
And it can panic the kernel with NULL pointer in
net_dm_packet_report_size()if the reason is 0, as drop_reasons[0] is NULL.Fixes 1330b6ef3313 ("skb: make drop reason booleanable")This patch is in net, should this fix have been targeting net / 5.18?
Yeah, I think it should have. What do I need to do? CC someone?
Jakub Kicinski
maintainerRe: [PATCH net-next v3 4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
Quoted 3 lines · On Fri, 20 May 2022 09:46:49 +0800 Menglong Dong wrote:
Quoted 1 line
This patch is in net, should this fix have been targeting net / 5.18?
Yeah, I think it should have. What do I need to do? CC someone?
Too late now, I was just double checking. It can make its way to the current release via stable in a week or two.
BTW I'm about to send a fixup to patch 4, stay tuned.
Jakub Kicinski
maintainerRe: [PATCH net-next v3 4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
Quoted 7 lines · On Thu, 19 May 2022 19:09:15 -0700 Jakub Kicinski wrote:
Quoted 3 lines · On Fri, 20 May 2022 09:46:49 +0800 Menglong Dong wrote:
Quoted 1 line
This patch is in net, should this fix have been targeting net / 5.18?
Yeah, I think it should have. What do I need to do? CC someone?
Too late now, I was just double checking. It can make its way to the current release via stable in a week or two.
Ah, FWIW my initial question was missing "-next" - I meant to say that the patch is in net-next rather than net. I think you got what I meant..
Re: [PATCH net-next v3 4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv()
Quoted 5 lines · Jakub Kicinski
Quoted 3 lines · On Thu, 19 May 2022 19:09:15 -0700 Jakub Kicinski wrote:
Quoted 2 lines · On Fri, 20 May 2022 09:46:49 +0800 Menglong Dong wrote:
Quoted 1 line
This patch is in net, should this fix have been targeting net / 5.18?
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Yeah, I think it should have. What do I need to do? CC someone?
Too late now, I was just double checking. It can make its way to the current release via stable in a week or two.
Ah, FWIW my initial question was missing "-next" - I meant to say that the patch is in net-next rather than net. I think you got what I meant..
Yeah, I get what you mean now. Such bug-fix patches should target 'net' rather than 'net-next'.
BTW, thanks for your fixup...I am still surprised at my mistake.
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 13 May 2022 11:03:35 +0800 you wrote:
From: Menglong Dong <[email protected]>
In the commit
1330b6ef3313("skb: make drop reason booleanable"),SKB_NOT_DROPPED_YETis added to the enumskb_drop_reason, which makes the invalid drop reasonSKB_NOT_DROPPED_YETcan leak to thekfree_skbtracepoint. Once this happen (it happened, as 4th patch says), it can cause NULL pointer in drop monitor and result in kernel panic.[...]
Here is the summary with links:
- [net-next,v3,1/4] net: dm: check the boundary of skb drop reasons
https://git.kernel.org/netdev/net-next/c/a3af33abd921 - [net-next,v3,2/4] net: skb: check the boundrary of drop reason in kfree_skb_reason() https://git.kernel.org/netdev/net-next/c/20bbcd0a94c6 - [net-next,v3,3/4] net: skb: change the definition SKB_DR_SET() https://git.kernel.org/netdev/net-next/c/7ebd3f3ee51a - [net-next,v3,4/4] net: tcp: reset 'drop_reason' to NOT_SPCIFIED in tcp_v{4,6}_rcv() https://git.kernel.org/netdev/net-next/c/f8319dfd1b3b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html