mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/
This commit is contained in:
commit
1ef43204f4
6 changed files with 36 additions and 14 deletions
|
@ -237,6 +237,8 @@ extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_t
|
|||
int newtype,
|
||||
struct ipv6_opt_hdr __user *newopt,
|
||||
int newoptlen);
|
||||
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
|
||||
struct ipv6_txoptions *opt);
|
||||
|
||||
extern int ip6_frag_nqueues;
|
||||
extern atomic_t ip6_frag_mem;
|
||||
|
|
|
@ -437,7 +437,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
|
|||
break;
|
||||
case IPPROTO_AH:
|
||||
nexthdr = ptr[0];
|
||||
len = (ptr[1] + 1) << 2;
|
||||
len = (ptr[1] + 2) << 2;
|
||||
break;
|
||||
default:
|
||||
nexthdr = ptr[0];
|
||||
|
|
|
@ -628,6 +628,7 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
|
|||
if (!tot_len)
|
||||
return NULL;
|
||||
|
||||
tot_len += sizeof(*opt2);
|
||||
opt2 = sock_kmalloc(sk, tot_len, GFP_ATOMIC);
|
||||
if (!opt2)
|
||||
return ERR_PTR(-ENOBUFS);
|
||||
|
@ -668,7 +669,26 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
|
|||
|
||||
return opt2;
|
||||
out:
|
||||
sock_kfree_s(sk, p, tot_len);
|
||||
sock_kfree_s(sk, opt2, opt2->tot_len);
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
|
||||
struct ipv6_txoptions *opt)
|
||||
{
|
||||
/*
|
||||
* ignore the dest before srcrt unless srcrt is being included.
|
||||
* --yoshfuji
|
||||
*/
|
||||
if (opt && opt->dst0opt && !opt->srcrt) {
|
||||
if (opt_space != opt) {
|
||||
memcpy(opt_space, opt, sizeof(*opt_space));
|
||||
opt = opt_space;
|
||||
}
|
||||
opt->opt_nflen -= ipv6_optlen(opt->dst0opt);
|
||||
opt->dst0opt = NULL;
|
||||
}
|
||||
|
||||
return opt;
|
||||
}
|
||||
|
||||
|
|
|
@ -225,20 +225,16 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
|
|||
struct ip6_flowlabel * fl,
|
||||
struct ipv6_txoptions * fopt)
|
||||
{
|
||||
struct ipv6_txoptions * fl_opt = fl ? fl->opt : NULL;
|
||||
|
||||
if (fopt == NULL || fopt->opt_flen == 0) {
|
||||
if (!fl_opt || !fl_opt->dst0opt || fl_opt->srcrt)
|
||||
return fl_opt;
|
||||
}
|
||||
|
||||
struct ipv6_txoptions * fl_opt = fl->opt;
|
||||
|
||||
if (fopt == NULL || fopt->opt_flen == 0)
|
||||
return fl_opt;
|
||||
|
||||
if (fl_opt != NULL) {
|
||||
opt_space->hopopt = fl_opt->hopopt;
|
||||
opt_space->dst0opt = fl_opt->srcrt ? fl_opt->dst0opt : NULL;
|
||||
opt_space->dst0opt = fl_opt->dst0opt;
|
||||
opt_space->srcrt = fl_opt->srcrt;
|
||||
opt_space->opt_nflen = fl_opt->opt_nflen;
|
||||
if (fl_opt->dst0opt && !fl_opt->srcrt)
|
||||
opt_space->opt_nflen -= ipv6_optlen(fl_opt->dst0opt);
|
||||
} else {
|
||||
if (fopt->opt_nflen == 0)
|
||||
return fopt;
|
||||
|
|
|
@ -748,7 +748,9 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
|||
}
|
||||
if (opt == NULL)
|
||||
opt = np->opt;
|
||||
opt = fl6_merge_options(&opt_space, flowlabel, opt);
|
||||
if (flowlabel)
|
||||
opt = fl6_merge_options(&opt_space, flowlabel, opt);
|
||||
opt = ipv6_fixup_options(&opt_space, opt);
|
||||
|
||||
fl.proto = proto;
|
||||
rawv6_probe_proto_opt(&fl, msg);
|
||||
|
|
|
@ -771,7 +771,9 @@ static int udpv6_sendmsg(struct kiocb *iocb, struct sock *sk,
|
|||
}
|
||||
if (opt == NULL)
|
||||
opt = np->opt;
|
||||
opt = fl6_merge_options(&opt_space, flowlabel, opt);
|
||||
if (flowlabel)
|
||||
opt = fl6_merge_options(&opt_space, flowlabel, opt);
|
||||
opt = ipv6_fixup_options(&opt_space, opt);
|
||||
|
||||
fl->proto = IPPROTO_UDP;
|
||||
ipv6_addr_copy(&fl->fl6_dst, daddr);
|
||||
|
|
Loading…
Reference in a new issue