* [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
@ 2024-10-23 3:52 Wang Liang
2024-10-23 6:43 ` Eric Dumazet
2024-10-29 23:50 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 4+ messages in thread
From: Wang Liang @ 2024-10-23 3:52 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni, idosch, kuniyu, stephen, dsahern,
lucien.xin
Cc: yuehaibing, zhangchangzhong, wangliang74, netdev, linux-kernel
Config a small gso_max_size/gso_ipv4_max_size will lead to an underflow
in sk_dst_gso_max_size(), which may trigger a BUG_ON crash,
because sk->sk_gso_max_size would be much bigger than device limits.
Call Trace:
tcp_write_xmit
tso_segs = tcp_init_tso_segs(skb, mss_now);
tcp_set_skb_tso_segs
tcp_skb_pcount_set
// skb->len = 524288, mss_now = 8
// u16 tso_segs = 524288/8 = 65535 -> 0
tso_segs = DIV_ROUND_UP(skb->len, mss_now)
BUG_ON(!tso_segs)
Add check for the minimum value of gso_max_size and gso_ipv4_max_size.
Fixes: 46e6b992c250 ("rtnetlink: allow GSO maximums to be set on device creation")
Fixes: 9eefedd58ae1 ("net: add gso_ipv4_max_size and gro_ipv4_max_size per device")
Signed-off-by: Wang Liang <wangliang74@huawei.com>
---
net/core/rtnetlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e30e7ea0207d..2ba5cd965d3f 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2032,7 +2032,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
[IFLA_NUM_TX_QUEUES] = { .type = NLA_U32 },
[IFLA_NUM_RX_QUEUES] = { .type = NLA_U32 },
[IFLA_GSO_MAX_SEGS] = { .type = NLA_U32 },
- [IFLA_GSO_MAX_SIZE] = { .type = NLA_U32 },
+ [IFLA_GSO_MAX_SIZE] = NLA_POLICY_MIN(NLA_U32, MAX_TCP_HEADER + 1),
[IFLA_PHYS_PORT_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
[IFLA_CARRIER_CHANGES] = { .type = NLA_U32 }, /* ignored */
[IFLA_PHYS_SWITCH_ID] = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
@@ -2057,7 +2057,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
[IFLA_TSO_MAX_SIZE] = { .type = NLA_REJECT },
[IFLA_TSO_MAX_SEGS] = { .type = NLA_REJECT },
[IFLA_ALLMULTI] = { .type = NLA_REJECT },
- [IFLA_GSO_IPV4_MAX_SIZE] = { .type = NLA_U32 },
+ [IFLA_GSO_IPV4_MAX_SIZE] = NLA_POLICY_MIN(NLA_U32, MAX_TCP_HEADER + 1),
[IFLA_GRO_IPV4_MAX_SIZE] = { .type = NLA_U32 },
};
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
2024-10-23 3:52 [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size Wang Liang
@ 2024-10-23 6:43 ` Eric Dumazet
2024-10-23 7:18 ` 回复: " wangliang (CI)
2024-10-29 23:50 ` patchwork-bot+netdevbpf
1 sibling, 1 reply; 4+ messages in thread
From: Eric Dumazet @ 2024-10-23 6:43 UTC (permalink / raw)
To: Wang Liang
Cc: davem, kuba, pabeni, idosch, kuniyu, stephen, dsahern, lucien.xin,
yuehaibing, zhangchangzhong, netdev, linux-kernel
On Wed, Oct 23, 2024 at 5:34 AM Wang Liang <wangliang74@huawei.com> wrote:
>
> Config a small gso_max_size/gso_ipv4_max_size will lead to an underflow
> in sk_dst_gso_max_size(), which may trigger a BUG_ON crash,
> because sk->sk_gso_max_size would be much bigger than device limits.
> Call Trace:
> tcp_write_xmit
> tso_segs = tcp_init_tso_segs(skb, mss_now);
> tcp_set_skb_tso_segs
> tcp_skb_pcount_set
> // skb->len = 524288, mss_now = 8
> // u16 tso_segs = 524288/8 = 65535 -> 0
> tso_segs = DIV_ROUND_UP(skb->len, mss_now)
> BUG_ON(!tso_segs)
> Add check for the minimum value of gso_max_size and gso_ipv4_max_size.
>
> Fixes: 46e6b992c250 ("rtnetlink: allow GSO maximums to be set on device creation")
> Fixes: 9eefedd58ae1 ("net: add gso_ipv4_max_size and gro_ipv4_max_size per device")
> Signed-off-by: Wang Liang <wangliang74@huawei.com>
> ---
Thanks for this fix !
Reviewed-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* 回复: [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
2024-10-23 6:43 ` Eric Dumazet
@ 2024-10-23 7:18 ` wangliang (CI)
0 siblings, 0 replies; 4+ messages in thread
From: wangliang (CI) @ 2024-10-23 7:18 UTC (permalink / raw)
To: Eric Dumazet
Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
idosch@nvidia.com, kuniyu@amazon.com, stephen@networkplumber.org,
dsahern@kernel.org, lucien.xin@gmail.com, yuehaibing,
zhangchangzhong, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Thank you very much for your suggestions!
-----邮件原件-----
发件人: Eric Dumazet <edumazet@google.com>
发送时间: 2024年10月23日 14:44
收件人: wangliang (CI) <wangliang74@huawei.com>
抄送: davem@davemloft.net; kuba@kernel.org; pabeni@redhat.com; idosch@nvidia.com; kuniyu@amazon.com; stephen@networkplumber.org; dsahern@kernel.org; lucien.xin@gmail.com; yuehaibing <yuehaibing@huawei.com>; zhangchangzhong <zhangchangzhong@huawei.com>; netdev@vger.kernel.org; linux-kernel@vger.kernel.org
主题: Re: [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
On Wed, Oct 23, 2024 at 5:34 AM Wang Liang <wangliang74@huawei.com> wrote:
>
> Config a small gso_max_size/gso_ipv4_max_size will lead to an
> underflow in sk_dst_gso_max_size(), which may trigger a BUG_ON crash,
> because sk->sk_gso_max_size would be much bigger than device limits.
> Call Trace:
> tcp_write_xmit
> tso_segs = tcp_init_tso_segs(skb, mss_now);
> tcp_set_skb_tso_segs
> tcp_skb_pcount_set
> // skb->len = 524288, mss_now = 8
> // u16 tso_segs = 524288/8 = 65535 -> 0
> tso_segs = DIV_ROUND_UP(skb->len, mss_now)
> BUG_ON(!tso_segs)
> Add check for the minimum value of gso_max_size and gso_ipv4_max_size.
>
> Fixes: 46e6b992c250 ("rtnetlink: allow GSO maximums to be set on
> device creation")
> Fixes: 9eefedd58ae1 ("net: add gso_ipv4_max_size and gro_ipv4_max_size
> per device")
> Signed-off-by: Wang Liang <wangliang74@huawei.com>
> ---
Thanks for this fix !
Reviewed-by: Eric Dumazet <edumazet@google.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
2024-10-23 3:52 [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size Wang Liang
2024-10-23 6:43 ` Eric Dumazet
@ 2024-10-29 23:50 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-10-29 23:50 UTC (permalink / raw)
To: wangliang
Cc: davem, edumazet, kuba, pabeni, idosch, kuniyu, stephen, dsahern,
lucien.xin, yuehaibing, zhangchangzhong, netdev, linux-kernel
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 23 Oct 2024 11:52:13 +0800 you wrote:
> Config a small gso_max_size/gso_ipv4_max_size will lead to an underflow
> in sk_dst_gso_max_size(), which may trigger a BUG_ON crash,
> because sk->sk_gso_max_size would be much bigger than device limits.
> Call Trace:
> tcp_write_xmit
> tso_segs = tcp_init_tso_segs(skb, mss_now);
> tcp_set_skb_tso_segs
> tcp_skb_pcount_set
> // skb->len = 524288, mss_now = 8
> // u16 tso_segs = 524288/8 = 65535 -> 0
> tso_segs = DIV_ROUND_UP(skb->len, mss_now)
> BUG_ON(!tso_segs)
> Add check for the minimum value of gso_max_size and gso_ipv4_max_size.
>
> [...]
Here is the summary with links:
- [net,v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size
https://git.kernel.org/netdev/net/c/9ab5cf19fb0e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-29 23:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-23 3:52 [PATCH net v2] net: fix crash when config small gso_max_size/gso_ipv4_max_size Wang Liang
2024-10-23 6:43 ` Eric Dumazet
2024-10-23 7:18 ` 回复: " wangliang (CI)
2024-10-29 23:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox