From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Fri, 15 Feb 2008 20:34:58 +0000 (+0000)
Subject: Use NXC_RAW_SOCKET for SOCK_RAW.
X-Git-Tag: linux-2.6-22-2~32
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1e737fb3ff6463119a8007da4eb4ee34c62adf4b;p=linux-2.6.git
Use NXC_RAW_SOCKET for SOCK_RAW.
---
diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch
index 9ae0e0df3..6bb2fe487 100644
--- a/linux-2.6-520-vnet+.patch
+++ b/linux-2.6-520-vnet+.patch
@@ -1,7 +1,7 @@
-diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h
---- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-02 04:52:17.000000000 -0500
-@@ -11,6 +11,7 @@
+diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h
+--- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-15 20:36:43.000000000 +0100
+@@ -11,6 +11,7 @@ enum {
XT_MARK_SET=0,
XT_MARK_AND,
XT_MARK_OR,
@@ -9,9 +9,9 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/i
};
struct xt_mark_target_info_v1 {
-diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h
---- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h
+--- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-15 20:36:43.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef _XT_SETXID_H_target
+#define _XT_SETXID_H_target
@@ -27,9 +27,9 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520
+};
+
+#endif /*_XT_SETXID_H_target*/
-diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h
---- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h
+--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-15 20:36:43.000000000 +0100
@@ -12,6 +12,7 @@
#define IPT_MARK_SET XT_MARK_SET
#define IPT_MARK_AND XT_MARK_AND
@@ -38,9 +38,9 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h linux-2.6.22
#define ipt_mark_target_info_v1 xt_mark_target_info_v1
-diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h
---- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h
+--- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-15 20:36:43.000000000 +0100
@@ -0,0 +1,13 @@
+#ifndef _IPT_SETXID_H_target
+#define _IPT_SETXID_H_target
@@ -55,10 +55,10 @@ diff -Nurb linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h linux-2.6.
+#define ipt_setxid_target_info_v1 xt_setxid_target_info_v1
+
+#endif /*_IPT_SETXID_H_target*/
-diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
---- linux-2.6.22-510/include/linux/skbuff.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-02 04:52:17.000000000 -0500
-@@ -302,6 +302,7 @@
+diff -Nurp linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
+--- linux-2.6.22-510/include/linux/skbuff.h 2007-07-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-15 20:36:43.000000000 +0100
+@@ -302,6 +302,7 @@ struct sk_buff {
#endif
__u32 mark;
@@ -66,10 +66,10 @@ diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linu
sk_buff_data_t transport_header;
sk_buff_data_t network_header;
-diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
---- linux-2.6.22-510/include/linux/socket.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/linux/socket.h 2008-02-02 04:52:17.000000000 -0500
-@@ -288,6 +288,8 @@
+diff -Nurp linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
+--- linux-2.6.22-510/include/linux/socket.h 2007-07-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/linux/socket.h 2008-02-15 20:36:43.000000000 +0100
+@@ -288,6 +288,8 @@ struct ucred {
#define SOL_TIPC 271
#define SOL_RXRPC 272
@@ -78,10 +78,10 @@ diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linu
/* IPX options */
#define IPX_TYPE 1
-diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h
---- linux-2.6.22-510/include/linux/vserver/network.h 2008-02-02 04:52:13.000000000 -0500
-+++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-02 04:52:17.000000000 -0500
-@@ -44,6 +44,8 @@
+diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h
+--- linux-2.6.22-510/include/linux/vserver/network.h 2008-02-15 20:36:27.000000000 +0100
++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-15 20:36:43.000000000 +0100
+@@ -45,6 +45,8 @@ static inline uint64_t __nxf_init_set(vo
/* network caps */
#define NXC_RAW_ICMP 0x00000100
@@ -90,10 +90,158 @@ diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/inc
/* address types */
-diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h
---- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-02 04:52:17.000000000 -0500
-@@ -131,6 +131,9 @@
+diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h.orig linux-2.6.22-520/include/linux/vserver/network.h.orig
+--- linux-2.6.22-510/include/linux/vserver/network.h.orig 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/include/linux/vserver/network.h.orig 2008-02-15 20:36:27.000000000 +0100
+@@ -0,0 +1,144 @@
++#ifndef _VX_NETWORK_H
++#define _VX_NETWORK_H
++
++#include <linux/types.h>
++
++
++#define MAX_N_CONTEXT 65535 /* Arbitrary limit */
++
++
++/* network flags */
++
++#define NXF_INFO_PRIVATE 0x00000008
++
++#define NXF_SINGLE_IP 0x00000100
++#define NXF_LBACK_REMAP 0x00000200
++#define NXF_LBACK_ALLOW 0x00000400
++
++#define NXF_HIDE_NETIF 0x02000000
++#define NXF_HIDE_LBACK 0x04000000
++
++#define NXF_STATE_SETUP (1ULL << 32)
++#define NXF_STATE_ADMIN (1ULL << 34)
++
++#define NXF_SC_HELPER (1ULL << 36)
++#define NXF_PERSISTENT (1ULL << 38)
++
++#define NXF_ONE_TIME (0x0005ULL << 32)
++
++
++#define NXF_INIT_SET (__nxf_init_set())
++
++static inline uint64_t __nxf_init_set(void) {
++ return NXF_STATE_ADMIN
++#ifdef CONFIG_VSERVER_AUTO_LBACK
++ | NXF_LBACK_REMAP
++ | NXF_HIDE_LBACK
++#endif
++#ifdef CONFIG_VSERVER_AUTO_SINGLE
++ | NXF_SINGLE_IP
++#endif
++ | NXF_HIDE_NETIF;
++}
++
++
++/* network caps */
++
++#define NXC_RAW_ICMP 0x00000100
++
++
++/* address types */
++
++#define NXA_TYPE_IPV4 0x0001
++#define NXA_TYPE_IPV6 0x0002
++
++#define NXA_TYPE_NONE 0x0000
++#define NXA_TYPE_ANY 0x00FF
++
++#define NXA_TYPE_ADDR 0x0010
++#define NXA_TYPE_MASK 0x0020
++#define NXA_TYPE_RANGE 0x0040
++
++#define NXA_MASK_ALL (NXA_TYPE_ADDR | NXA_TYPE_MASK | NXA_TYPE_RANGE)
++
++#define NXA_MOD_BCAST 0x0100
++#define NXA_MOD_LBACK 0x0200
++
++#define NXA_LOOPBACK 0x1000
++
++#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK)
++#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK)
++
++#ifdef __KERNEL__
++
++#include <linux/list.h>
++#include <linux/spinlock.h>
++#include <linux/rcupdate.h>
++#include <linux/in.h>
++#include <linux/in6.h>
++#include <asm/atomic.h>
++
++struct nx_addr_v4 {
++ struct nx_addr_v4 *next;
++ struct in_addr ip[2];
++ struct in_addr mask;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_addr_v6 {
++ struct nx_addr_v6 *next;
++ struct in6_addr ip;
++ struct in6_addr mask;
++ uint32_t prefix;
++ uint16_t type;
++ uint16_t flags;
++};
++
++struct nx_info {
++ struct hlist_node nx_hlist; /* linked list of nxinfos */
++ nid_t nx_id; /* vnet id */
++ atomic_t nx_usecnt; /* usage count */
++ atomic_t nx_tasks; /* tasks count */
++ int nx_state; /* context state */
++
++ uint64_t nx_flags; /* network flag word */
++ uint64_t nx_ncaps; /* network capabilities */
++
++ struct in_addr v4_lback; /* Loopback address */
++ struct in_addr v4_bcast; /* Broadcast address */
++ struct nx_addr_v4 v4; /* First/Single ipv4 address */
++#ifdef CONFIG_IPV6
++ struct nx_addr_v6 v6; /* First/Single ipv6 address */
++#endif
++ char nx_name[65]; /* network context name */
++};
++
++
++/* status flags */
++
++#define NXS_HASHED 0x0001
++#define NXS_SHUTDOWN 0x0100
++#define NXS_RELEASED 0x8000
++
++extern struct nx_info *lookup_nx_info(int);
++
++extern int get_nid_list(int, unsigned int *, int);
++extern int nid_is_hashed(nid_t);
++
++extern int nx_migrate_task(struct task_struct *, struct nx_info *);
++
++extern long vs_net_change(struct nx_info *, unsigned int);
++
++struct sock;
++
++
++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE)
++#ifdef CONFIG_IPV6
++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE)
++#else
++#define NX_IPV6(n) (0)
++#endif
++
++#endif /* __KERNEL__ */
++#endif /* _VX_NETWORK_H */
+diff -Nurp linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h
+--- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-22 00:00:24.000000000 +0200
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-15 20:36:43.000000000 +0100
+@@ -131,6 +131,9 @@ struct nf_conn
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
@@ -103,10 +251,10 @@ diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-52
/* features dynamically at the end: helper, nat (both optional) */
char data[0];
};
-diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
---- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/include/net/raw.h 2008-02-02 04:52:17.000000000 -0500
-@@ -36,7 +36,7 @@
+diff -Nurp linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
+--- linux-2.6.22-510/include/net/raw.h 2007-05-04 15:55:46.000000000 +0200
++++ linux-2.6.22-520/include/net/raw.h 2008-02-15 20:36:43.000000000 +0100
+@@ -36,7 +36,7 @@ extern rwlock_t raw_v4_lock;
extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
__be32 raddr, __be32 laddr,
@@ -115,9 +263,9 @@ diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
-diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
---- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/core/skbuff.c 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
+--- linux-2.6.22-510/net/core/skbuff.c 2007-07-22 00:00:25.000000000 +0200
++++ linux-2.6.22-520/net/core/skbuff.c 2008-02-15 20:36:44.000000000 +0100
@@ -56,6 +56,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
@@ -126,7 +274,7 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
#include <net/protocol.h>
#include <net/dst.h>
-@@ -174,6 +175,7 @@
+@@ -174,6 +175,7 @@ struct sk_buff *__alloc_skb(unsigned int
skb->data = data;
skb_reset_tail_pointer(skb);
skb->end = skb->tail + size;
@@ -134,7 +282,7 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
/* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 1);
-@@ -443,6 +445,8 @@
+@@ -443,6 +445,8 @@ struct sk_buff *skb_clone(struct sk_buff
C(tail);
C(end);
@@ -143,7 +291,7 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
atomic_inc(&(skb_shinfo(skb)->dataref));
skb->cloned = 1;
-@@ -492,6 +496,7 @@
+@@ -492,6 +496,7 @@ static void copy_skb_header(struct sk_bu
new->tc_index = old->tc_index;
#endif
skb_copy_secmark(new, old);
@@ -151,10 +299,10 @@ diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
atomic_set(&new->users, 1);
skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
-diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
---- linux-2.6.22-510/net/core/sock.c 2008-02-02 04:52:13.000000000 -0500
-+++ linux-2.6.22-520/net/core/sock.c 2008-02-02 04:52:17.000000000 -0500
-@@ -444,6 +444,19 @@
+diff -Nurp linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
+--- linux-2.6.22-510/net/core/sock.c 2008-02-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/core/sock.c 2008-02-15 20:36:44.000000000 +0100
+@@ -444,6 +444,19 @@ set_sndbuf:
}
goto set_sndbuf;
@@ -174,7 +322,7 @@ diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
case SO_RCVBUF:
/* Don't error on this BSD doesn't and if you think
about it this is right. Otherwise apps have to
-@@ -573,7 +586,7 @@
+@@ -573,7 +586,7 @@ set_rcvbuf:
char devname[IFNAMSIZ];
/* Sorry... */
@@ -183,10 +331,10 @@ diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
ret = -EPERM;
break;
}
-diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
---- linux-2.6.22-510/net/ipv4/af_inet.c 2008-02-02 04:52:13.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-02 04:52:17.000000000 -0500
-@@ -178,6 +178,8 @@
+diff -Nurp linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
+--- linux-2.6.22-510/net/ipv4/af_inet.c 2008-02-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-15 21:33:42.000000000 +0100
+@@ -178,6 +178,8 @@ static int inet_autobind(struct sock *sk
return -EAGAIN;
}
inet->sport = htons(inet->num);
@@ -195,10 +343,20 @@ diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet
}
release_sock(sk);
return 0;
-diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
---- linux-2.6.22-510/net/ipv4/icmp.c 2008-02-02 04:52:16.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-02 04:52:17.000000000 -0500
-@@ -709,7 +709,7 @@
+@@ -312,6 +314,9 @@ lookup_protocol:
+ if ((protocol == IPPROTO_ICMP) &&
+ nx_capable(answer->capability, NXC_RAW_ICMP))
+ goto override;
++ if (sock->type == SOCK_RAW &&
++ nx_capable(answer->capability, NXC_RAW_SOCKET))
++ goto override;
+ if (answer->capability > 0 && !capable(answer->capability))
+ goto out_rcu_unlock;
+ override:
+diff -Nurp linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
+--- linux-2.6.22-510/net/ipv4/icmp.c 2008-02-15 20:36:42.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-15 20:36:44.000000000 +0100
+@@ -709,7 +709,7 @@ static void icmp_unreach(struct sk_buff
if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
iph->saddr,
@@ -207,10 +365,10 @@ diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
raw_err(raw_sk, skb, info);
raw_sk = sk_next(raw_sk);
iph = (struct iphdr *)skb->data;
-diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
---- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-02 04:52:17.000000000 -0500
-@@ -409,7 +409,7 @@
+diff -Nurp linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
+--- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-22 00:00:25.000000000 +0200
++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-15 20:36:44.000000000 +0100
+@@ -409,7 +409,7 @@ int ip_options_compile(struct ip_options
optptr[2] += 8;
break;
default:
@@ -219,7 +377,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o
pp_ptr = optptr + 3;
goto error;
}
-@@ -445,7 +445,7 @@
+@@ -445,7 +445,7 @@ int ip_options_compile(struct ip_options
opt->router_alert = optptr - iph;
break;
case IPOPT_CIPSO:
@@ -228,7 +386,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o
pp_ptr = optptr;
goto error;
}
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ int ip_options_compile(struct ip_options
case IPOPT_SEC:
case IPOPT_SID:
default:
@@ -237,10 +395,10 @@ diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_o
pp_ptr = optptr;
goto error;
}
-diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
---- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-02-02 04:52:09.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-02 04:52:17.000000000 -0500
-@@ -49,6 +49,8 @@
+diff -Nurp linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
+--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-02-15 20:35:53.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-15 20:36:44.000000000 +0100
+@@ -49,6 +49,8 @@ static void dump_packet(const struct nf_
else
logflags = NF_LOG_MASK;
@@ -249,10 +407,10 @@ diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ip
ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
if (ih == NULL) {
printk("TRUNCATED");
-diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
---- linux-2.6.22-510/net/ipv4/raw.c 2008-02-02 04:52:13.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-02 04:52:17.000000000 -0500
-@@ -103,7 +103,7 @@
+diff -Nurp linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
+--- linux-2.6.22-510/net/ipv4/raw.c 2008-02-15 20:36:20.000000000 +0100
++++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-15 20:36:44.000000000 +0100
+@@ -103,7 +103,7 @@ static void raw_v4_unhash(struct sock *s
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
__be32 raddr, __be32 laddr,
@@ -261,7 +419,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
{
struct hlist_node *node;
-@@ -112,6 +112,7 @@
+@@ -112,6 +112,7 @@ struct sock *__raw_v4_lookup(struct sock
if (inet->num == num &&
!(inet->daddr && inet->daddr != raddr) &&
@@ -269,7 +427,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
!(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
goto found; /* gotcha */
-@@ -161,7 +162,7 @@
+@@ -161,7 +162,7 @@ int raw_v4_input(struct sk_buff *skb, st
goto out;
sk = __raw_v4_lookup(__sk_head(head), iph->protocol,
iph->saddr, iph->daddr,
@@ -278,7 +436,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
while (sk) {
delivered = 1;
-@@ -174,7 +175,7 @@
+@@ -174,7 +175,7 @@ int raw_v4_input(struct sk_buff *skb, st
}
sk = __raw_v4_lookup(sk_next(sk), iph->protocol,
iph->saddr, iph->daddr,
@@ -287,7 +445,7 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
}
out:
read_unlock(&raw_v4_lock);
-@@ -315,7 +316,7 @@
+@@ -315,7 +316,7 @@ static int raw_send_hdrinc(struct sock *
}
err = -EPERM;
@@ -296,10 +454,10 @@ diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
sk->sk_nx_info &&
!v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
goto error_free;
-diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
---- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-02 04:52:17.000000000 -0500
-@@ -389,6 +389,13 @@
+diff -Nurp linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
+--- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-15 20:36:44.000000000 +0100
+@@ -389,6 +389,13 @@ config NETFILTER_XT_TARGET_TCPMSS
To compile it as a module, choose M here. If unsure, say N.
@@ -313,10 +471,10 @@ diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter
config NETFILTER_XT_MATCH_COMMENT
tristate '"comment" match support'
depends on NETFILTER_XTABLES
-diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
---- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-02 04:52:17.000000000 -0500
-@@ -37,6 +37,7 @@
+diff -Nurp linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
+--- linux-2.6.22-510/net/netfilter/Makefile 2007-07-21 23:58:59.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-15 20:36:44.000000000 +0100
+@@ -37,6 +37,7 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_co
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
# targets
@@ -324,10 +482,10 @@ diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilte
obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
-diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
---- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-02 04:52:17.000000000 -0500
-@@ -726,6 +726,8 @@
+diff -Nurp linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
+--- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-15 20:36:44.000000000 +0100
+@@ -726,6 +726,8 @@ init_conntrack(const struct nf_conntrack
/* Overload tuple linked list to put us in unconfirmed list. */
list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
@@ -336,9 +494,9 @@ diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/n
write_unlock_bh(&nf_conntrack_lock);
-diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
---- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-08 06:20:11.000000000 -0500
+diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
+--- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-21 23:59:00.000000000 +0200
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-15 20:36:44.000000000 +0100
@@ -5,13 +5,18 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -358,7 +516,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_MARK.h>
-@@ -21,6 +26,48 @@
+@@ -21,6 +26,48 @@ MODULE_DESCRIPTION("ip[6]tables MARK mod
MODULE_ALIAS("ipt_MARK");
MODULE_ALIAS("ip6t_MARK");
@@ -407,7 +565,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
static unsigned int
target_v0(struct sk_buff **pskb,
const struct net_device *in,
-@@ -44,7 +91,7 @@
+@@ -44,7 +91,7 @@ target_v1(struct sk_buff **pskb,
const void *targinfo)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;
@@ -416,7 +574,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
switch (markinfo->mode) {
case XT_MARK_SET:
-@@ -58,8 +105,49 @@
+@@ -58,8 +105,49 @@ target_v1(struct sk_buff **pskb,
case XT_MARK_OR:
mark = (*pskb)->mark | markinfo->mark;
break;
@@ -466,7 +624,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
(*pskb)->mark = mark;
return XT_CONTINUE;
}
-@@ -92,7 +180,8 @@
+@@ -92,7 +180,8 @@ checkentry_v1(const char *tablename,
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
@@ -476,9 +634,9 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt
printk(KERN_WARNING "MARK: unknown mode %u\n",
markinfo->mode);
return 0;
-diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
---- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
+--- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-15 20:36:44.000000000 +0100
@@ -0,0 +1,79 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
@@ -559,9 +717,9 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfi
+
+module_init(init);
+module_exit(fini);
-diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
---- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
-+++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-02 04:52:17.000000000 -0500
+diff -Nurp linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
+--- linux-2.6.22-510/net/packet/af_packet.c 2007-07-22 00:00:27.000000000 +0200
++++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-15 20:36:45.000000000 +0100
@@ -78,6 +78,7 @@
#include <linux/poll.h>
#include <linux/module.h>
@@ -570,7 +728,7 @@ diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a
#ifdef CONFIG_INET
#include <net/inet_common.h>
-@@ -420,6 +421,10 @@
+@@ -420,6 +421,10 @@ static inline unsigned int run_filter(st
unsigned int res)
{
struct sk_filter *filter;
@@ -581,7 +739,7 @@ diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a
rcu_read_lock_bh();
filter = rcu_dereference(sk->sk_filter);
-@@ -984,7 +989,7 @@
+@@ -984,7 +989,7 @@ static int packet_create(struct socket *
__be16 proto = (__force __be16)protocol; /* weird, but documented */
int err;