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

Commit ce7fa1b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents d898d485 9bffc4ac

include/linux/rtnetlink.h

+4 −0
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ enum rtnetlink_groups { 
#define	RTNLGRP_IPV4_MROUTE	RTNLGRP_IPV4_MROUTE

	RTNLGRP_IPV4_ROUTE,

#define RTNLGRP_IPV4_ROUTE	RTNLGRP_IPV4_ROUTE

	RTNLGRP_NOP1,

	RTNLGRP_IPV6_IFADDR,

#define RTNLGRP_IPV6_IFADDR	RTNLGRP_IPV6_IFADDR

	RTNLGRP_IPV6_MROUTE,
@@ -876,8 +877,11 @@ enum rtnetlink_groups { 
#define RTNLGRP_IPV6_IFINFO	RTNLGRP_IPV6_IFINFO

	RTNLGRP_DECnet_IFADDR,

#define RTNLGRP_DECnet_IFADDR	RTNLGRP_DECnet_IFADDR

	RTNLGRP_NOP2,

	RTNLGRP_DECnet_ROUTE,

#define RTNLGRP_DECnet_ROUTE	RTNLGRP_DECnet_ROUTE

	RTNLGRP_NOP3,

	RTNLGRP_NOP4,

	RTNLGRP_IPV6_PREFIX,

#define RTNLGRP_IPV6_PREFIX	RTNLGRP_IPV6_PREFIX

	__RTNLGRP_MAX

include/net/xfrm.h

+1 −0
Original line number Diff line number Diff line
@@ -890,6 +890,7 @@ struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto, 
extern void xfrm_policy_flush(void);

extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);

extern int xfrm_flush_bundles(void);

extern void xfrm_flush_all_bundles(void);

extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family);

extern void xfrm_init_pmtu(struct dst_entry *dst);

net/bridge/br_netfilter.c

+7 −10
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int check_hbh_len(struct sk_buff *skb) 
	len -= 2;



	while (len > 0) {

		int optlen = raw[off+1]+2;

		int optlen = skb->nh.raw[off+1]+2;



		switch (skb->nh.raw[off]) {

		case IPV6_TLV_PAD0:
@@ -308,18 +308,15 @@ static int check_hbh_len(struct sk_buff *skb) 
		case IPV6_TLV_JUMBO:

			if (skb->nh.raw[off+1] != 4 || (off&3) != 2)

				goto bad;



			pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2));



			if (pkt_len <= IPV6_MAXPLEN ||

			    skb->nh.ipv6h->payload_len)

				goto bad;

			if (pkt_len > skb->len - sizeof(struct ipv6hdr))

				goto bad;

			if (pkt_len + sizeof(struct ipv6hdr) < skb->len) {

				if (__pskb_trim(skb,

			if (pskb_trim_rcsum(skb,

			    pkt_len+sizeof(struct ipv6hdr)))

				goto bad;

				if (skb->ip_summed == CHECKSUM_HW)

					skb->ip_summed = CHECKSUM_NONE;

			}

			break;

		default:

			if (optlen > len)

net/ipv4/netfilter/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o ip_nat_proto_gre.o 


# connection tracking

obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o

obj-$(CONFIG_IP_NF_NAT) += ip_nat.o



# conntrack netlink interface

obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o
@@ -41,7 +42,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o 
# the three instances of ip_tables

obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o

obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o

obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o

obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o

obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o



# matches

net/ipv4/xfrm4_policy.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) 
		case IPPROTO_UDP:

		case IPPROTO_TCP:

		case IPPROTO_SCTP:

		case IPPROTO_DCCP:

			if (pskb_may_pull(skb, xprth + 4 - skb->data)) {

				u16 *ports = (u16 *)xprth;