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

Commit 190ff5b3 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:
  [NETFILTER]: xt_hashlimit: fix ip6tables dependency
  [SCTP]: Force update of the rto when processing HB-ACK
  [IPV6]: fix BUG of ndisc_send_redirect()
  [IPV6]: Fix up some CONFIG typos
  [NETFILTER]: SIP conntrack: fix out of bounds memory access
  [NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers
  [NETFILTER]: xt_connbytes: fix division by zero
  [MAINTAINERS]: netfilter@ is subscribers-only
parents 6fd6b17c 2e553023

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2288,7 +2288,7 @@ P: Jozsef Kadlecsik 
P:	Patrick McHardy

M:	kaber@trash.net

L:	netfilter-devel@lists.netfilter.org

L:	netfilter@lists.netfilter.org

L:	netfilter@lists.netfilter.org (subscribers-only)

L:	coreteam@netfilter.org

W:	http://www.netfilter.org/

W:	http://www.iptables.org/

net/ipv4/netfilter/ip_conntrack_sip.c

+8 −2
Original line number Diff line number Diff line
@@ -283,10 +283,16 @@ static int skp_epaddr_len(const char *dptr, const char *limit, int *shift) 
{

	int s = *shift;



	for (; dptr <= limit && *dptr != '@'; dptr++)

	/* Search for @, but stop at the end of the line.

	 * We are inside a sip: URI, so we don't need to worry about

	 * continuation lines. */

	while (dptr <= limit &&

	       *dptr != '@' && *dptr != '\r' && *dptr != '\n') {

		(*shift)++;

		dptr++;

	}



	if (*dptr == '@') {

	if (dptr <= limit && *dptr == '@') {

		dptr++;

		(*shift)++;

	} else

net/ipv6/addrconf.c

+2 −2
Original line number Diff line number Diff line
@@ -3393,7 +3393,7 @@ static void inline ipv6_store_devconf(struct ipv6_devconf *cnf, 
#ifdef CONFIG_IPV6_ROUTER_PREF

	array[DEVCONF_ACCEPT_RA_RTR_PREF] = cnf->accept_ra_rtr_pref;

	array[DEVCONF_RTR_PROBE_INTERVAL] = cnf->rtr_probe_interval;

#ifdef CONFIV_IPV6_ROUTE_INFO

#ifdef CONFIG_IPV6_ROUTE_INFO

	array[DEVCONF_ACCEPT_RA_RT_INFO_MAX_PLEN] = cnf->accept_ra_rt_info_max_plen;

#endif

#endif
@@ -3898,7 +3898,7 @@ static struct addrconf_sysctl_table 
			.proc_handler	=	&proc_dointvec_jiffies,

			.strategy	=	&sysctl_jiffies,

		},

#ifdef CONFIV_IPV6_ROUTE_INFO

#ifdef CONFIG_IPV6_ROUTE_INFO

		{

			.ctl_name	=	NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,

			.procname	=	"accept_ra_rt_info_max_plen",

net/ipv6/ndisc.c

+7 −0
Original line number Diff line number Diff line
@@ -1413,6 +1413,13 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, 
 		return;

 	}



	if (!ipv6_addr_equal(&skb->nh.ipv6h->daddr, target) &&

	    !(ipv6_addr_type(target) & IPV6_ADDR_LINKLOCAL)) {

		ND_PRINTK2(KERN_WARNING

			"ICMPv6 Redirect: target address is not link-local.\n");

		return;

	}



	ndisc_flow_init(&fl, NDISC_REDIRECT, &saddr_buf, &skb->nh.ipv6h->saddr,

			dev->ifindex);

net/netfilter/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ config NETFILTER_XT_MATCH_TCPMSS 


config NETFILTER_XT_MATCH_HASHLIMIT

	tristate '"hashlimit" match support'

	depends on NETFILTER_XTABLES

	depends on NETFILTER_XTABLES && (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)

	help

	  This option adds a `hashlimit' match.