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

Commit 1275361c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Fix MAX_HEADER setting.
  [NETFILTER]: ipt_REJECT: fix memory corruption
  [NETFILTER]: conntrack: fix refcount leak when finding expectation
  [NETFILTER]: ctnetlink: fix reference count leak
  [NETFILTER]: nf_conntrack: fix the race on assign helper to new conntrack
  [NETFILTER]: nfctnetlink: assign helper to newly created conntrack
parents 4f404caf e81c7359

include/linux/netdevice.h

+4 −2
Original line number Diff line number Diff line
@@ -93,8 +93,10 @@ struct netpoll_info; 
#endif

#endif



#if !defined(CONFIG_NET_IPIP) && \

    !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE)

#if !defined(CONFIG_NET_IPIP) && !defined(CONFIG_NET_IPIP_MODULE) && \

    !defined(CONFIG_NET_IPGRE) &&  !defined(CONFIG_NET_IPGRE_MODULE) && \

    !defined(CONFIG_IPV6_SIT) && !defined(CONFIG_IPV6_SIT_MODULE) && \

    !defined(CONFIG_IPV6_TUNNEL) && !defined(CONFIG_IPV6_TUNNEL_MODULE)

#define MAX_HEADER LL_MAX_HEADER

#else

#define MAX_HEADER (LL_MAX_HEADER + 48)

net/ipv4/netfilter/ip_conntrack_core.c

+3 −3
Original line number Diff line number Diff line
@@ -225,11 +225,9 @@ __ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple) 
	struct ip_conntrack_expect *i;

	

	list_for_each_entry(i, &ip_conntrack_expect_list, list) {

		if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) {

			atomic_inc(&i->use);

		if (ip_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))

			return i;

	}

	}

	return NULL;

}
@@ -241,6 +239,8 @@ ip_conntrack_expect_find(const struct ip_conntrack_tuple *tuple) 
	

	read_lock_bh(&ip_conntrack_lock);

	i = __ip_conntrack_expect_find(tuple);

	if (i)

		atomic_inc(&i->use);

	read_unlock_bh(&ip_conntrack_lock);



	return i;

net/ipv4/netfilter/ip_conntrack_netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ ctnetlink_dump_protoinfo(struct sk_buff *skb, const struct ip_conntrack *ct) 
	return ret;



nfattr_failure:

	ip_conntrack_proto_put(proto);

	return -1;

}

net/ipv4/netfilter/ipt_REJECT.c

+9 −7
Original line number Diff line number Diff line
@@ -114,6 +114,14 @@ static void send_reset(struct sk_buff *oldskb, int hook) 
	tcph->window = 0;

	tcph->urg_ptr = 0;



	/* Adjust TCP checksum */

	tcph->check = 0;

	tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),

				   nskb->nh.iph->saddr,

				   nskb->nh.iph->daddr,

				   csum_partial((char *)tcph,

						sizeof(struct tcphdr), 0));



	/* Set DF, id = 0 */

	nskb->nh.iph->frag_off = htons(IP_DF);

	nskb->nh.iph->id = 0;
@@ -129,14 +137,8 @@ static void send_reset(struct sk_buff *oldskb, int hook) 
	if (ip_route_me_harder(&nskb, addr_type))

		goto free_nskb;



	/* Adjust TCP checksum */

	nskb->ip_summed = CHECKSUM_NONE;

	tcph->check = 0;

	tcph->check = tcp_v4_check(tcph, sizeof(struct tcphdr),

				   nskb->nh.iph->saddr,

				   nskb->nh.iph->daddr,

				   csum_partial((char *)tcph,

						sizeof(struct tcphdr), 0));



	/* Adjust IP TTL */

	nskb->nh.iph->ttl = dst_metric(nskb->dst, RTAX_HOPLIMIT);

net/netfilter/nf_conntrack_core.c

+9 −10
Original line number Diff line number Diff line
@@ -469,11 +469,9 @@ __nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple) 
	struct nf_conntrack_expect *i;

	

	list_for_each_entry(i, &nf_conntrack_expect_list, list) {

		if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask)) {

			atomic_inc(&i->use);

		if (nf_ct_tuple_mask_cmp(tuple, &i->tuple, &i->mask))

			return i;

	}

	}

	return NULL;

}
@@ -485,6 +483,8 @@ nf_conntrack_expect_find(const struct nf_conntrack_tuple *tuple) 
	

	read_lock_bh(&nf_conntrack_lock);

	i = __nf_conntrack_expect_find(tuple);

	if (i)

		atomic_inc(&i->use);

	read_unlock_bh(&nf_conntrack_lock);



	return i;
@@ -893,12 +893,6 @@ __nf_conntrack_alloc(const struct nf_conntrack_tuple *orig, 


	memset(conntrack, 0, nf_ct_cache[features].size);

	conntrack->features = features;

	if (helper) {

		struct nf_conn_help *help = nfct_help(conntrack);

		NF_CT_ASSERT(help);

		help->helper = helper;

	}



	atomic_set(&conntrack->ct_general.use, 1);

	conntrack->ct_general.destroy = destroy_conntrack;

	conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple = *orig;
@@ -982,8 +976,13 @@ init_conntrack(const struct nf_conntrack_tuple *tuple, 
#endif

		nf_conntrack_get(&conntrack->master->ct_general);

		NF_CT_STAT_INC(expect_new);

	} else

	} else {

		struct nf_conn_help *help = nfct_help(conntrack);



		if (help)

			help->helper = __nf_ct_helper_find(&repl_tuple);

		NF_CT_STAT_INC(new);

	}



	/* Overload tuple linked list to put us in unconfirmed list. */

	list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);