diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-05-09 18:16:46 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-09 18:16:47 -0700 |
commit | fc54e39199928cb09f5423654f344631ac5956fb (patch) | |
tree | c1b9a0c519666287a9f2446072d9249ac26a21fd | |
parent | 630fd4822af2374cd75c682b7665dcb367613765 (diff) | |
parent | a063f2fba3fa633a599253b62561051ac185fa99 (diff) | |
download | linux-fc54e39199928cb09f5423654f344631ac5956fb.tar.bz2 |
Merge tag 'batadv-net-pullrequest-20220508' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here is a batman-adv bugfix:
- Don't skb_split skbuffs with frag_list, by Sven Eckelmann
* tag 'batadv-net-pullrequest-20220508' of git://git.open-mesh.org/linux-merge:
batman-adv: Don't skb_split skbuffs with frag_list
====================
Link: https://lore.kernel.org/r/20220508132110.20451-1-sw@simonwunderlich.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r-- | net/batman-adv/fragmentation.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0899a729a23f..c120c7c6d25f 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -475,6 +475,17 @@ int batadv_frag_send_packet(struct sk_buff *skb, goto free_skb; } + /* GRO might have added fragments to the fragment list instead of + * frags[]. But this is not handled by skb_split and must be + * linearized to avoid incorrect length information after all + * batman-adv fragments were created and submitted to the + * hard-interface + */ + if (skb_has_frag_list(skb) && __skb_linearize(skb)) { + ret = -ENOMEM; + goto free_skb; + } + /* Create one header to be copied to all fragments */ frag_header.packet_type = BATADV_UNICAST_FRAG; frag_header.version = BATADV_COMPAT_VERSION; |