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

Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/

Browse Source
This commit is contained in:
David S. Miller
2005-11-20 20:52:16 -08:00
parent 5d5780df23 df9890c31a
commit 1ef43204f4
6 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ipv6.h
View File

@@ -237,6 +237,8 @@ extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_t
int newtype, int newtype,
struct ipv6_opt_hdr __user *newopt, struct ipv6_opt_hdr __user *newopt,
int newoptlen); int newoptlen);
struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
struct ipv6_txoptions *opt);
extern int ip6_frag_nqueues; extern int ip6_frag_nqueues;
extern atomic_t ip6_frag_mem; extern atomic_t ip6_frag_mem;

2
net/ipv6/datagram.c
View File

@@ -437,7 +437,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
break; break;
case IPPROTO_AH: case IPPROTO_AH:
nexthdr = ptr[0]; nexthdr = ptr[0];
len = (ptr[1] + 1) << 2; len = (ptr[1] + 2) << 2;
break; break;
default: default:
nexthdr = ptr[0]; nexthdr = ptr[0];

22
net/ipv6/exthdrs.c
View File

@@ -628,6 +628,7 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
if (!tot_len) if (!tot_len)
return NULL; return NULL;
tot_len += sizeof(*opt2);
opt2 = sock_kmalloc(sk, tot_len, GFP_ATOMIC); opt2 = sock_kmalloc(sk, tot_len, GFP_ATOMIC);
if (!opt2) if (!opt2)
return ERR_PTR(-ENOBUFS); return ERR_PTR(-ENOBUFS);
@@ -668,7 +669,26 @@ ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
return opt2; return opt2;
out: out:
sock_kfree_s(sk, p, tot_len); sock_kfree_s(sk, opt2, opt2->tot_len);
return ERR_PTR(err); 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;
}

16
net/ipv6/ip6_flowlabel.c
View File

@@ -225,20 +225,16 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
struct ip6_flowlabel * fl, struct ip6_flowlabel * fl,
struct ipv6_txoptions * fopt) struct ipv6_txoptions * fopt)
{ {
struct ipv6_txoptions * fl_opt = fl ? fl->opt : NULL; struct ipv6_txoptions * fl_opt = fl->opt;
if (fopt == NULL || fopt->opt_flen == 0) { if (fopt == NULL || fopt->opt_flen == 0)
if (!fl_opt || !fl_opt->dst0opt || fl_opt->srcrt) return fl_opt;
return fl_opt;
}
if (fl_opt != NULL) { if (fl_opt != NULL) {
opt_space->hopopt = fl_opt->hopopt; 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->srcrt = fl_opt->srcrt;
opt_space->opt_nflen = fl_opt->opt_nflen; 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 { } else {
if (fopt->opt_nflen == 0) if (fopt->opt_nflen == 0)
return fopt; return fopt;

4
net/ipv6/raw.c
View File

@@ -748,7 +748,9 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
} }
if (opt == NULL) if (opt == NULL)
opt = np->opt; 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; fl.proto = proto;
rawv6_probe_proto_opt(&fl, msg); rawv6_probe_proto_opt(&fl, msg);

4
net/ipv6/udp.c
View File

@@ -771,7 +771,9 @@ do_udp_sendmsg:
} }
if (opt == NULL) if (opt == NULL)
opt = np->opt; 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; fl->proto = IPPROTO_UDP;
ipv6_addr_copy(&fl->fl6_dst, daddr); ipv6_addr_copy(&fl->fl6_dst, daddr);