Skip to content

Commit 6628ddf

Browse files
PhilPotterdavem330
authored andcommitted
net: geneve: check skb is large enough for IPv4/IPv6 header
Check within geneve_xmit_skb/geneve6_xmit_skb that sk_buff structure is large enough to include IPv4 or IPv6 header, and reject if not. The geneve_xmit_skb portion and overall idea was contributed by Eric Dumazet. Fixes a KMSAN-found uninit-value bug reported by syzbot at: https://syzkaller.appspot.com/bug?id=abe95dc3e3e9667fc23b8d81f29ecad95c6f106f Suggested-by: Eric Dumazet <edumazet@google.com> Reported-by: syzbot+2e406a9ac75bb71d4b7a@syzkaller.appspotmail.com Signed-off-by: Phillip Potter <phil@philpotter.co.uk> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 31457db commit 6628ddf

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/net/geneve.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,9 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
891891
__be16 sport;
892892
int err;
893893

894+
if (!pskb_network_may_pull(skb, sizeof(struct iphdr)))
895+
return -EINVAL;
896+
894897
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
895898
rt = geneve_get_v4_rt(skb, dev, gs4, &fl4, info,
896899
geneve->cfg.info.key.tp_dst, sport);
@@ -985,6 +988,9 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
985988
__be16 sport;
986989
int err;
987990

991+
if (!pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
992+
return -EINVAL;
993+
988994
sport = udp_flow_src_port(geneve->net, skb, 1, USHRT_MAX, true);
989995
dst = geneve_get_v6_dst(skb, dev, gs6, &fl6, info,
990996
geneve->cfg.info.key.tp_dst, sport);

0 commit comments

Comments
 (0)