lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV6]: Fix kernel OOPs when setting sticky socket options.

Browse Source 
Bug noticed by Remi Denis-Courmont <rdenis@simphalempin.com>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki
2006-08-31 14:52:17 -07:00
committed by David S. Miller
parent dd1a47c21e
commit 99c7bc0133
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
net/ipv6/exthdrs.c
View File

@@ -635,14 +635,17 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
struct ipv6_txoptions *opt2; struct ipv6_txoptions *opt2;
int err; int err;
if (newtype != IPV6_HOPOPTS && opt->hopopt) if (opt) {
tot_len += CMSG_ALIGN(ipv6_optlen(opt->hopopt)); if (newtype != IPV6_HOPOPTS && opt->hopopt)
if (newtype != IPV6_RTHDRDSTOPTS && opt->dst0opt) tot_len += CMSG_ALIGN(ipv6_optlen(opt->hopopt));
tot_len += CMSG_ALIGN(ipv6_optlen(opt->dst0opt)); if (newtype != IPV6_RTHDRDSTOPTS && opt->dst0opt)
if (newtype != IPV6_RTHDR && opt->srcrt) tot_len += CMSG_ALIGN(ipv6_optlen(opt->dst0opt));
tot_len += CMSG_ALIGN(ipv6_optlen(opt->srcrt)); if (newtype != IPV6_RTHDR && opt->srcrt)
if (newtype != IPV6_DSTOPTS && opt->dst1opt) tot_len += CMSG_ALIGN(ipv6_optlen(opt->srcrt));
tot_len += CMSG_ALIGN(ipv6_optlen(opt->dst1opt)); if (newtype != IPV6_DSTOPTS && opt->dst1opt)
tot_len += CMSG_ALIGN(ipv6_optlen(opt->dst1opt));
}
if (newopt && newoptlen) if (newopt && newoptlen)
tot_len += CMSG_ALIGN(newoptlen); tot_len += CMSG_ALIGN(newoptlen);
@@ -659,25 +662,25 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
opt2->tot_len = tot_len; opt2->tot_len = tot_len;
p = (char *)(opt2 + 1); p = (char *)(opt2 + 1);
err = ipv6_renew_option(opt->hopopt, newopt, newoptlen, err = ipv6_renew_option(opt ? opt->hopopt : NULL, newopt, newoptlen,
newtype != IPV6_HOPOPTS, newtype != IPV6_HOPOPTS,
&opt2->hopopt, &p); &opt2->hopopt, &p);
if (err) if (err)
goto out; goto out;
err = ipv6_renew_option(opt->dst0opt, newopt, newoptlen, err = ipv6_renew_option(opt ? opt->dst0opt : NULL, newopt, newoptlen,
newtype != IPV6_RTHDRDSTOPTS, newtype != IPV6_RTHDRDSTOPTS,
&opt2->dst0opt, &p); &opt2->dst0opt, &p);
if (err) if (err)
goto out; goto out;
err = ipv6_renew_option(opt->srcrt, newopt, newoptlen, err = ipv6_renew_option(opt ? opt->srcrt : NULL, newopt, newoptlen,
newtype != IPV6_RTHDR, newtype != IPV6_RTHDR,
(struct ipv6_opt_hdr **)opt2->srcrt, &p); (struct ipv6_opt_hdr **)&opt2->srcrt, &p);
if (err) if (err)
goto out; goto out;
err = ipv6_renew_option(opt->dst1opt, newopt, newoptlen, err = ipv6_renew_option(opt ? opt->dst1opt : NULL, newopt, newoptlen,
newtype != IPV6_DSTOPTS, newtype != IPV6_DSTOPTS,
&opt2->dst1opt, &p); &opt2->dst1opt, &p);
if (err) if (err)