ip: on queued skb use skb_header_pointer instead of pskb_may_pull
authorWillem de Bruijn <willemb@google.com>
Mon, 7 Jan 2019 21:47:33 +0000 (16:47 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jan 2019 14:27:20 +0000 (09:27 -0500)
commit4a06fa67c4da20148803525151845276cdb995c1
treefce2609c8420b949997d123cec8aacd178a0cd1d
parent0b7959b6257322f7693b08a459c505d4938646f2
ip: on queued skb use skb_header_pointer instead of pskb_may_pull

Commit 2efd4fca703a ("ip: in cmsg IP(V6)_ORIGDSTADDR call
pskb_may_pull") avoided a read beyond the end of the skb linear
segment by calling pskb_may_pull.

That function can trigger a BUG_ON in pskb_expand_head if the skb is
shared, which it is when when peeking. It can also return ENOMEM.

Avoid both by switching to safer skb_header_pointer.

Fixes: 2efd4fca703a ("ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull")
Reported-by: syzbot <syzkaller@googlegroups.com>
Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_sockglue.c
net/ipv6/datagram.c