korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipv6: dccp: fix out of bound access in dccp_v6_err()

Browse Source 
dccp_v6_err() does not use pskb_may_pull() and might access garbage.

We only need 4 bytes at the beginning of the DCCP header, like TCP,
so the 8 bytes pulled in icmpv6_notify() are more than enough.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2016-11-02 20:30:48 -07:00 committed by David S. Miller
parent 93636d1f1f
commit 1aa9d1a0e7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/dccp/ipv6.c
View File

@ -70,7 +70,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
u8 type, u8 code, int offset, __be32 info) u8 type, u8 code, int offset, __be32 info)
{ {
const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data; const struct ipv6hdr *hdr = (const struct ipv6hdr *)skb->data;
const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset); const struct dccp_hdr *dh;
struct dccp_sock *dp; struct dccp_sock *dp;
struct ipv6_pinfo *np; struct ipv6_pinfo *np;
struct sock *sk; struct sock *sk;
@ -78,12 +78,13 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
__u64 seq; __u64 seq;
struct net *net = dev_net(skb->dev); struct net *net = dev_net(skb->dev);
if (skb->len < offset + sizeof(*dh) || /* Only need dccph_dport & dccph_sport which are the first
skb->len < offset + __dccp_basic_hdr_len(dh)) { * 4 bytes in dccp header.
__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev), * Our caller (icmpv6_notify()) already pulled 8 bytes for us.
ICMP6_MIB_INERRORS); */
return; BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_sport) > 8);
} BUILD_BUG_ON(offsetofend(struct dccp_hdr, dccph_dport) > 8);
dh = (struct dccp_hdr *)(skb->data + offset);
sk = __inet6_lookup_established(net, &dccp_hashinfo, sk = __inet6_lookup_established(net, &dccp_hashinfo,
&hdr->daddr, dh->dccph_dport, &hdr->daddr, dh->dccph_dport,