]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
bonding: Return pointer to data after pull on skb
authorJiri Wiesner <jwiesner@suse.de>
Tue, 10 Oct 2023 16:39:33 +0000 (18:39 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Oct 2023 10:21:13 +0000 (11:21 +0100)
Since 429e3d123d9a ("bonding: Fix extraction of ports from the packet
headers"), header offsets used to compute a hash in bond_xmit_hash() are
relative to skb->data and not skb->head. If the tail of the header buffer
of an skb really needs to be advanced and the operation is successful, the
pointer to the data must be returned (and not a pointer to the head of the
buffer).

Fixes: 429e3d123d9a ("bonding: Fix extraction of ports from the packet headers")
Signed-off-by: Jiri Wiesner <jwiesner@suse.de>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index ed7212e61c541b20b4f07d98faa76b6e2ebc300e..51d47eda1c873debda6da094377bcb3367a78f6e 100644 (file)
@@ -4023,7 +4023,7 @@ static inline const void *bond_pull_data(struct sk_buff *skb,
        if (likely(n <= hlen))
                return data;
        else if (skb && likely(pskb_may_pull(skb, n)))
-               return skb->head;
+               return skb->data;
 
        return NULL;
 }