Skip to content

Commit d93f3f9

Browse files
Jiri Wiesnerdavem330
authored andcommitted
bonding: Return pointer to data after pull on skb
Since 429e3d1 ("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: 429e3d1 ("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>
1 parent e8c127b commit d93f3f9

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/bonding/bond_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4023,7 +4023,7 @@ static inline const void *bond_pull_data(struct sk_buff *skb,
40234023
if (likely(n <= hlen))
40244024
return data;
40254025
else if (skb && likely(pskb_may_pull(skb, n)))
4026-
return skb->head;
4026+
return skb->data;
40274027

40284028
return NULL;
40294029
}

0 commit comments

Comments
 (0)