Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef43204 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 5d5780df df9890c3

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

net/ipv6/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

net/ipv6/exthdrs.c

+21 −1
Original line number Diff line number Diff line
@@ -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;

}

net/ipv6/ip6_flowlabel.c

+6 −10
Original line number Diff line number Diff line
@@ -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;

	struct ipv6_txoptions * fl_opt = fl->opt;

	

	if (fopt == NULL || fopt->opt_flen == 0) {

		if (!fl_opt || !fl_opt->dst0opt || fl_opt->srcrt)

	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;

net/ipv6/raw.c

+3 −1
Original line number Diff line number Diff line
@@ -748,7 +748,9 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, 
	}

	if (opt == NULL)

		opt = np->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);