From 9de598b6b9efdaf6170bf6f53b673fa6a3512d38 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Fri, 14 Mar 2008 20:30:11 +0000 Subject: [PATCH] Upgraded teh VNET+ patch based on 4.2. --- linux-2.6-520-vnet+.patch | 863 ++++++++++++++++++++++++++++++++------ 1 file changed, 737 insertions(+), 126 deletions(-) diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch index fa1e4fcce..512dda8c5 100644 --- a/linux-2.6-520-vnet+.patch +++ b/linux-2.6-520-vnet+.patch @@ -1,7 +1,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-17 21:49:35.000000000 -0400 -+++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2007-12-03 15:11:08.000000000 -0500 -@@ -11,6 +11,7 @@ enum { +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-03-14 16:29:22.000000000 -0400 +@@ -11,6 +11,7 @@ XT_MARK_SET=0, XT_MARK_AND, XT_MARK_OR, @@ -9,9 +9,9 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/i }; struct xt_mark_target_info_v1 { -diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h +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 2007-12-03 15:11:08.000000000 -0500 ++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-03-14 16:29:22.000000000 -0400 @@ -0,0 +1,14 @@ +#ifndef _XT_SETXID_H_target +#define _XT_SETXID_H_target @@ -27,26 +27,20 @@ diff -Nurp linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520 +}; + +#endif /*_XT_SETXID_H_target*/ -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-17 21:49:35.000000000 -0400 -+++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2007-12-03 15:11:08.000000000 -0500 -@@ -9,9 +9,10 @@ - #define ipt_mark_target_info xt_mark_target_info - - /* Version 1 */ --#define IPT_MARK_SET XT_MARK_SET --#define IPT_MARK_AND XT_MARK_AND --#define IPT_MARK_OR XT_MARK_OR -+#define IPT_MARK_SET XT_MARK_SET -+#define IPT_MARK_AND XT_MARK_AND -+#define IPT_MARK_OR XT_MARK_OR +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-03-14 16:29:22.000000000 -0400 +@@ -12,6 +12,7 @@ + #define IPT_MARK_SET XT_MARK_SET + #define IPT_MARK_AND XT_MARK_AND + #define IPT_MARK_OR XT_MARK_OR +#define IPT_MARK_COPYXID XT_MARK_COPYXID #define ipt_mark_target_info_v1 xt_mark_target_info_v1 -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 +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 2007-12-03 15:11:08.000000000 -0500 ++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-03-14 16:29:22.000000000 -0400 @@ -0,0 +1,13 @@ +#ifndef _IPT_SETXID_H_target +#define _IPT_SETXID_H_target @@ -61,10 +55,10 @@ diff -Nurp 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 -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-21 18:00:24.000000000 -0400 -+++ linux-2.6.22-520/include/linux/skbuff.h 2007-12-03 15:20:15.000000000 -0500 -@@ -302,6 +302,7 @@ struct sk_buff { +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-03-14 16:29:22.000000000 -0400 +@@ -302,6 +302,7 @@ #endif __u32 mark; @@ -72,10 +66,10 @@ diff -Nurp 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 -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-21 18:00:24.000000000 -0400 -+++ linux-2.6.22-520/include/linux/socket.h 2007-12-03 15:11:08.000000000 -0500 -@@ -288,6 +288,8 @@ struct ucred { +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-03-14 16:29:22.000000000 -0400 +@@ -288,6 +288,8 @@ #define SOL_TIPC 271 #define SOL_RXRPC 272 @@ -84,10 +78,10 @@ diff -Nurp linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linu /* IPX options */ #define IPX_TYPE 1 -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 2007-12-03 15:10:48.000000000 -0500 -+++ linux-2.6.22-520/include/linux/vserver/network.h 2007-12-03 15:11:08.000000000 -0500 -@@ -44,6 +44,8 @@ static inline uint64_t __nxf_init_set(vo +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-03-14 16:28:36.000000000 -0400 ++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-03-14 16:29:22.000000000 -0400 +@@ -44,6 +44,8 @@ /* network caps */ #define NXC_RAW_ICMP 0x00000100 @@ -96,10 +90,304 @@ diff -Nurp linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/inc /* address types */ -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-21 18:00:24.000000000 -0400 -+++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2007-12-03 15:11:08.000000000 -0500 -@@ -131,6 +131,9 @@ struct nf_conn +diff -Nurb 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 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/include/linux/vserver/network.h.orig 2008-03-14 16:29:27.000000000 -0400 +@@ -0,0 +1,143 @@ ++#ifndef _VX_NETWORK_H ++#define _VX_NETWORK_H ++ ++#include ++ ++ ++#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_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 ++#include ++#include ++#include ++#include ++#include ++ ++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 -Nurb linux-2.6.22-510/include/linux/vserver/network.h.orig.orig linux-2.6.22-520/include/linux/vserver/network.h.orig.orig +--- linux-2.6.22-510/include/linux/vserver/network.h.orig.orig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/include/linux/vserver/network.h.orig.orig 2008-03-14 16:28:36.000000000 -0400 +@@ -0,0 +1,143 @@ ++#ifndef _VX_NETWORK_H ++#define _VX_NETWORK_H ++ ++#include ++ ++ ++#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_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 ++#include ++#include ++#include ++#include ++#include ++ ++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 -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-03-14 16:29:27.000000000 -0400 +@@ -131,6 +131,9 @@ /* Storage reserved for other modules: */ union nf_conntrack_proto proto; @@ -109,10 +397,10 @@ diff -Nurp 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 -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 09:55:46.000000000 -0400 -+++ linux-2.6.22-520/include/net/raw.h 2007-12-03 15:11:08.000000000 -0500 -@@ -36,7 +36,7 @@ extern rwlock_t raw_v4_lock; +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-03-14 16:29:27.000000000 -0400 +@@ -36,7 +36,7 @@ extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, @@ -121,9 +409,9 @@ diff -Nurp 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 -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-21 18:00:25.000000000 -0400 -+++ linux-2.6.22-520/net/core/skbuff.c 2007-12-03 15:11:08.000000000 -0500 +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-03-14 16:29:27.000000000 -0400 @@ -56,6 +56,7 @@ #include #include @@ -132,7 +420,7 @@ diff -Nurp linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c #include #include -@@ -174,6 +175,7 @@ struct sk_buff *__alloc_skb(unsigned int +@@ -174,6 +175,7 @@ skb->data = data; skb_reset_tail_pointer(skb); skb->end = skb->tail + size; @@ -140,7 +428,7 @@ diff -Nurp 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 @@ struct sk_buff *skb_clone(struct sk_buff +@@ -443,6 +445,8 @@ C(tail); C(end); @@ -149,7 +437,7 @@ diff -Nurp 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 @@ static void copy_skb_header(struct sk_bu +@@ -492,6 +496,7 @@ new->tc_index = old->tc_index; #endif skb_copy_secmark(new, old); @@ -157,10 +445,10 @@ diff -Nurp 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 -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 2007-12-03 15:10:56.000000000 -0500 -+++ linux-2.6.22-520/net/core/sock.c 2007-12-03 15:11:08.000000000 -0500 -@@ -444,6 +444,19 @@ set_sndbuf: +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-03-14 16:28:36.000000000 -0400 ++++ linux-2.6.22-520/net/core/sock.c 2008-03-14 16:29:27.000000000 -0400 +@@ -444,6 +444,19 @@ } goto set_sndbuf; @@ -180,7 +468,7 @@ diff -Nurp 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 @@ set_rcvbuf: +@@ -573,7 +586,7 @@ char devname[IFNAMSIZ]; /* Sorry... */ @@ -189,10 +477,10 @@ diff -Nurp linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c ret = -EPERM; break; } -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 2007-12-03 15:10:56.000000000 -0500 -+++ linux-2.6.22-520/net/ipv4/af_inet.c 2007-12-03 15:11:08.000000000 -0500 -@@ -178,6 +178,8 @@ static int inet_autobind(struct sock *sk +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-03-14 16:28:36.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-03-14 16:29:27.000000000 -0400 +@@ -178,6 +178,8 @@ return -EAGAIN; } inet->sport = htons(inet->num); @@ -201,10 +489,20 @@ diff -Nurp 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 -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 2007-12-03 15:11:06.000000000 -0500 -+++ linux-2.6.22-520/net/ipv4/icmp.c 2007-12-03 15:11:08.000000000 -0500 -@@ -709,7 +709,7 @@ static void icmp_unreach(struct sk_buff +@@ -312,6 +314,9 @@ + 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 -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-03-14 16:28:42.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-03-14 16:29:27.000000000 -0400 +@@ -709,7 +709,7 @@ if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) { while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr, iph->saddr, @@ -213,10 +511,10 @@ diff -Nurp 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 -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-21 18:00:25.000000000 -0400 -+++ linux-2.6.22-520/net/ipv4/ip_options.c 2007-12-03 15:11:08.000000000 -0500 -@@ -409,7 +409,7 @@ int ip_options_compile(struct ip_options +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-03-14 16:29:27.000000000 -0400 +@@ -409,7 +409,7 @@ optptr[2] += 8; break; default: @@ -225,7 +523,7 @@ diff -Nurp 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 @@ int ip_options_compile(struct ip_options +@@ -445,7 +445,7 @@ opt->router_alert = optptr - iph; break; case IPOPT_CIPSO: @@ -234,7 +532,7 @@ diff -Nurp 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 @@ int ip_options_compile(struct ip_options +@@ -458,7 +458,7 @@ case IPOPT_SEC: case IPOPT_SID: default: @@ -243,10 +541,10 @@ diff -Nurp 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 -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 2007-12-03 15:10:26.000000000 -0500 -+++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2007-12-03 15:11:08.000000000 -0500 -@@ -49,6 +49,8 @@ static void dump_packet(const struct nf_ +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-03-14 16:28:20.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-03-14 16:29:27.000000000 -0400 +@@ -49,6 +49,8 @@ else logflags = NF_LOG_MASK; @@ -255,10 +553,10 @@ diff -Nurp 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 -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 2007-12-03 15:10:56.000000000 -0500 -+++ linux-2.6.22-520/net/ipv4/raw.c 2007-12-03 15:11:08.000000000 -0500 -@@ -103,7 +103,7 @@ static void raw_v4_unhash(struct sock *s +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-03-14 16:28:36.000000000 -0400 ++++ linux-2.6.22-520/net/ipv4/raw.c 2008-03-14 16:29:27.000000000 -0400 +@@ -103,7 +103,7 @@ struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, __be32 raddr, __be32 laddr, @@ -267,7 +565,7 @@ diff -Nurp 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 @@ struct sock *__raw_v4_lookup(struct sock +@@ -112,6 +112,7 @@ if (inet->num == num && !(inet->daddr && inet->daddr != raddr) && @@ -275,7 +573,7 @@ diff -Nurp 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 @@ int raw_v4_input(struct sk_buff *skb, st +@@ -161,7 +162,7 @@ goto out; sk = __raw_v4_lookup(__sk_head(head), iph->protocol, iph->saddr, iph->daddr, @@ -284,7 +582,7 @@ diff -Nurp 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 @@ int raw_v4_input(struct sk_buff *skb, st +@@ -174,7 +175,7 @@ } sk = __raw_v4_lookup(sk_next(sk), iph->protocol, iph->saddr, iph->daddr, @@ -293,7 +591,7 @@ diff -Nurp 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 @@ static int raw_send_hdrinc(struct sock * +@@ -315,7 +316,7 @@ } err = -EPERM; @@ -302,10 +600,10 @@ diff -Nurp 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 -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-21 18:00:27.000000000 -0400 -+++ linux-2.6.22-520/net/netfilter/Kconfig 2007-12-03 15:11:08.000000000 -0500 -@@ -389,6 +389,13 @@ config NETFILTER_XT_TARGET_TCPMSS +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-03-14 16:29:27.000000000 -0400 +@@ -389,6 +389,13 @@ To compile it as a module, choose M here. If unsure, say N. @@ -319,10 +617,10 @@ diff -Nurp 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 -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 17:58:59.000000000 -0400 -+++ linux-2.6.22-520/net/netfilter/Makefile 2007-12-03 15:11:08.000000000 -0500 -@@ -37,6 +37,7 @@ obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_co +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-03-14 16:29:27.000000000 -0400 +@@ -37,6 +37,7 @@ obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o # targets @@ -330,10 +628,10 @@ diff -Nurp 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 -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-21 18:00:27.000000000 -0400 -+++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2007-12-03 15:11:08.000000000 -0500 -@@ -726,6 +726,8 @@ init_conntrack(const struct nf_conntrack +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-03-14 16:29:27.000000000 -0400 +@@ -726,6 +726,8 @@ /* Overload tuple linked list to put us in unconfirmed list. */ list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed); @@ -342,9 +640,9 @@ diff -Nurp linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/n write_unlock_bh(&nf_conntrack_lock); -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 17:59:00.000000000 -0400 -+++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2007-12-03 15:11:08.000000000 -0500 +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-03-14 16:29:27.000000000 -0400 @@ -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 @@ -364,7 +662,7 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt #include #include -@@ -21,6 +26,48 @@ MODULE_DESCRIPTION("ip[6]tables MARK mod +@@ -21,6 +26,48 @@ MODULE_ALIAS("ipt_MARK"); MODULE_ALIAS("ip6t_MARK"); @@ -413,7 +711,7 @@ diff -Nurp 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 @@ target_v1(struct sk_buff **pskb, +@@ -44,7 +91,7 @@ const void *targinfo) { const struct xt_mark_target_info_v1 *markinfo = targinfo; @@ -422,7 +720,7 @@ diff -Nurp 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,9 +105,52 @@ target_v1(struct sk_buff **pskb, +@@ -58,8 +105,58 @@ case XT_MARK_OR: mark = (*pskb)->mark | markinfo->mark; break; @@ -435,12 +733,13 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt + struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo); + extern struct inet_hashinfo tcp_hashinfo; + enum ip_conntrack_dir dir; -+ + if (!ct) + break; ++ + dir = CTINFO2DIR(ctinfo); + u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip; + u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple); ++ u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum; + + u_int32_t ip; + u_int16_t port; @@ -449,34 +748,38 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilt + ip = ct->tuplehash[dir].tuple.dst.u3.ip; + port = get_dst_port(&ct->tuplehash[dir].tuple); + -+ if ((*pskb)->sk) -+ connection_sk = (*pskb)->sk; -+ else { -+ connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif); -+ } ++ if (proto == 1 || proto == 17) { ++ if (((*pskb)->mark!=-1) && (*pskb)->mark) ++ ct->xid[0]=(*pskb)->mark; ++ if (ct->xid[0]) ++ mark = ct->xid[0]; + -+ if (connection_sk) { -+#ifdef REQUIRESFIXFROMSAPAN -+ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir]; -+ ct->xid[!dir]=connection_sk->sk_xid; -+ /*connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;*/ -+ if (connection_sk->sk_xid != 0) -+ mark = connection_sk->sk_xid; -+#endif -+ if (connection_sk != (*pskb)->sk) -+ sock_put(connection_sk); -+ } -+ break; + } ++ else if (proto == 6) { ++ if ((*pskb)->sk) ++ connection_sk = (*pskb)->sk; ++ else { ++ connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif); ++ } ++ ++ if (connection_sk) { ++ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir]; ++ ct->xid[!dir]=connection_sk->sk_xid; ++ if (connection_sk->sk_xid != 0) ++ mark = connection_sk->sk_xid; ++ if (connection_sk != (*pskb)->sk) ++ sock_put(connection_sk); ++ } ++ break; ++ } ++ } } -- (*pskb)->mark = mark; + if (mark != -1) -+ (*pskb)->mark = mark; + (*pskb)->mark = mark; return XT_CONTINUE; } - -@@ -92,7 +182,8 @@ checkentry_v1(const char *tablename, +@@ -92,7 +189,8 @@ if (markinfo->mode != XT_MARK_SET && markinfo->mode != XT_MARK_AND @@ -486,9 +789,297 @@ diff -Nurp 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 -Nurp linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c +diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c.orig linux-2.6.22-520/net/netfilter/xt_MARK.c.orig +--- linux-2.6.22-510/net/netfilter/xt_MARK.c.orig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.22-520/net/netfilter/xt_MARK.c.orig 2008-03-14 16:29:27.000000000 -0400 +@@ -0,0 +1,284 @@ ++/* This is a module which is used for setting the NFMARK field of an skb. */ ++ ++/* (C) 1999-2001 Marc Boucher ++ * ++ * 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 ++ * published by the Free Software Foundation. ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++ ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Marc Boucher "); ++MODULE_DESCRIPTION("ip[6]tables MARK modification module"); ++MODULE_ALIAS("ipt_MARK"); ++MODULE_ALIAS("ip6t_MARK"); ++ ++static inline u_int16_t ++get_dst_port(struct nf_conntrack_tuple *tuple) ++{ ++ switch (tuple->dst.protonum) { ++ case IPPROTO_GRE: ++ /* XXX Truncate 32-bit GRE key to 16 bits */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11) ++ return tuple->dst.u.gre.key; ++#else ++ return htons(ntohl(tuple->dst.u.gre.key)); ++#endif ++ case IPPROTO_ICMP: ++ /* Bind on ICMP echo ID */ ++ return tuple->src.u.icmp.id; ++ case IPPROTO_TCP: ++ return tuple->dst.u.tcp.port; ++ case IPPROTO_UDP: ++ return tuple->dst.u.udp.port; ++ default: ++ return tuple->dst.u.all; ++ } ++} ++ ++static inline u_int16_t ++get_src_port(struct nf_conntrack_tuple *tuple) ++{ ++ switch (tuple->dst.protonum) { ++ case IPPROTO_GRE: ++ /* XXX Truncate 32-bit GRE key to 16 bits */ ++ return htons(ntohl(tuple->src.u.gre.key)); ++ case IPPROTO_ICMP: ++ /* Bind on ICMP echo ID */ ++ return tuple->src.u.icmp.id; ++ case IPPROTO_TCP: ++ return tuple->src.u.tcp.port; ++ case IPPROTO_UDP: ++ return tuple->src.u.udp.port; ++ default: ++ return tuple->src.u.all; ++ } ++} ++ ++static unsigned int ++target_v0(struct sk_buff **pskb, ++ const struct net_device *in, ++ const struct net_device *out, ++ unsigned int hooknum, ++ const struct xt_target *target, ++ const void *targinfo) ++{ ++ const struct xt_mark_target_info *markinfo = targinfo; ++ ++ (*pskb)->mark = markinfo->mark; ++ return XT_CONTINUE; ++} ++ ++static unsigned int ++target_v1(struct sk_buff **pskb, ++ const struct net_device *in, ++ const struct net_device *out, ++ unsigned int hooknum, ++ const struct xt_target *target, ++ const void *targinfo) ++{ ++ const struct xt_mark_target_info_v1 *markinfo = targinfo; ++ int mark = -1; ++ ++ switch (markinfo->mode) { ++ case XT_MARK_SET: ++ mark = markinfo->mark; ++ break; ++ ++ case XT_MARK_AND: ++ mark = (*pskb)->mark & markinfo->mark; ++ break; ++ ++ case XT_MARK_OR: ++ mark = (*pskb)->mark | markinfo->mark; ++ break; ++ ++ case XT_MARK_COPYXID: { ++ enum ip_conntrack_info ctinfo; ++ struct sock *connection_sk; ++ int dif; ++ ++ struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo); ++ extern struct inet_hashinfo tcp_hashinfo; ++ enum ip_conntrack_dir dir; ++ if (!ct) ++ break; ++ ++ dir = CTINFO2DIR(ctinfo); ++ u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip; ++ u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple); ++ u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum; ++ ++ u_int32_t ip; ++ u_int16_t port; ++ ++ dif = ((struct rtable *)(*pskb)->dst)->rt_iif; ++ ip = ct->tuplehash[dir].tuple.dst.u3.ip; ++ port = get_dst_port(&ct->tuplehash[dir].tuple); ++ ++ if (proto == 1) { ++ if (((*pskb)->mark!=-1) && (*pskb)->mark) ++ ct->xid[0]=(*pskb)->mark; ++ if (ct->xid[0]) ++ mark = ct->xid[0]; ++ printk(KERN_CRIT "%d %d\n",ct->xid[0],(*pskb)->mark); ++ ++ } ++ else if (proto == 6) { ++ if ((*pskb)->sk) ++ connection_sk = (*pskb)->sk; ++ else { ++ connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif); ++ } ++ ++ if (connection_sk) { ++ connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir]; ++ ct->xid[!dir]=connection_sk->sk_xid; ++ if (connection_sk->sk_xid != 0) ++ mark = connection_sk->sk_xid; ++ if (connection_sk != (*pskb)->sk) ++ sock_put(connection_sk); ++ } ++ break; ++ } ++ } ++ } ++ ++ if (mark != -1) ++ (*pskb)->mark = mark; ++ return XT_CONTINUE; ++} ++ ++ ++static int ++checkentry_v0(const char *tablename, ++ const void *entry, ++ const struct xt_target *target, ++ void *targinfo, ++ unsigned int hook_mask) ++{ ++ struct xt_mark_target_info *markinfo = targinfo; ++ ++ if (markinfo->mark > 0xffffffff) { ++ printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n"); ++ return 0; ++ } ++ return 1; ++} ++ ++static int ++checkentry_v1(const char *tablename, ++ const void *entry, ++ const struct xt_target *target, ++ void *targinfo, ++ unsigned int hook_mask) ++{ ++ struct xt_mark_target_info_v1 *markinfo = targinfo; ++ ++ if (markinfo->mode != XT_MARK_SET ++ && markinfo->mode != XT_MARK_AND ++ && markinfo->mode != XT_MARK_OR ++ && markinfo->mode != XT_MARK_COPYXID) { ++ printk(KERN_WARNING "MARK: unknown mode %u\n", ++ markinfo->mode); ++ return 0; ++ } ++ if (markinfo->mark > 0xffffffff) { ++ printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n"); ++ return 0; ++ } ++ return 1; ++} ++ ++#ifdef CONFIG_COMPAT ++struct compat_xt_mark_target_info_v1 { ++ compat_ulong_t mark; ++ u_int8_t mode; ++ u_int8_t __pad1; ++ u_int16_t __pad2; ++}; ++ ++static void compat_from_user_v1(void *dst, void *src) ++{ ++ struct compat_xt_mark_target_info_v1 *cm = src; ++ struct xt_mark_target_info_v1 m = { ++ .mark = cm->mark, ++ .mode = cm->mode, ++ }; ++ memcpy(dst, &m, sizeof(m)); ++} ++ ++static int compat_to_user_v1(void __user *dst, void *src) ++{ ++ struct xt_mark_target_info_v1 *m = src; ++ struct compat_xt_mark_target_info_v1 cm = { ++ .mark = m->mark, ++ .mode = m->mode, ++ }; ++ return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0; ++} ++#endif /* CONFIG_COMPAT */ ++ ++static struct xt_target xt_mark_target[] = { ++ { ++ .name = "MARK", ++ .family = AF_INET, ++ .revision = 0, ++ .checkentry = checkentry_v0, ++ .target = target_v0, ++ .targetsize = sizeof(struct xt_mark_target_info), ++ .table = "mangle", ++ .me = THIS_MODULE, ++ }, ++ { ++ .name = "MARK", ++ .family = AF_INET, ++ .revision = 1, ++ .checkentry = checkentry_v1, ++ .target = target_v1, ++ .targetsize = sizeof(struct xt_mark_target_info_v1), ++#ifdef CONFIG_COMPAT ++ .compatsize = sizeof(struct compat_xt_mark_target_info_v1), ++ .compat_from_user = compat_from_user_v1, ++ .compat_to_user = compat_to_user_v1, ++#endif ++ .table = "mangle", ++ .me = THIS_MODULE, ++ }, ++ { ++ .name = "MARK", ++ .family = AF_INET6, ++ .revision = 0, ++ .checkentry = checkentry_v0, ++ .target = target_v0, ++ .targetsize = sizeof(struct xt_mark_target_info), ++ .table = "mangle", ++ .me = THIS_MODULE, ++ }, ++}; ++ ++static int __init xt_mark_init(void) ++{ ++ return xt_register_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target)); ++} ++ ++static void __exit xt_mark_fini(void) ++{ ++ xt_unregister_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target)); ++} ++ ++module_init(xt_mark_init); ++module_exit(xt_mark_fini); +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 2007-12-03 15:11:08.000000000 -0500 ++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-03-14 16:29:27.000000000 -0400 @@ -0,0 +1,79 @@ +#include +#include @@ -569,9 +1160,9 @@ diff -Nurp linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfi + +module_init(init); +module_exit(fini); -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-21 18:00:27.000000000 -0400 -+++ linux-2.6.22-520/net/packet/af_packet.c 2007-12-03 15:11:08.000000000 -0500 +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-03-14 16:29:27.000000000 -0400 @@ -78,6 +78,7 @@ #include #include @@ -580,7 +1171,17 @@ diff -Nurp linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/a #ifdef CONFIG_INET #include -@@ -420,6 +421,10 @@ static inline unsigned int run_filter(st +@@ -324,6 +325,9 @@ + __be16 proto=0; + int err; + ++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND)) ++ return -EPERM; ++ + /* + * Get and verify the address. + */ +@@ -420,6 +424,10 @@ unsigned int res) { struct sk_filter *filter; @@ -591,12 +1192,22 @@ diff -Nurp 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 @@ static int packet_create(struct socket * +@@ -711,6 +719,9 @@ + unsigned char *addr; + int ifindex, err, reserve = 0; + ++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND)) ++ return -EPERM; ++ + /* + * Get and verify the address. + */ +@@ -984,7 +995,7 @@ __be16 proto = (__force __be16)protocol; /* weird, but documented */ int err; - if (!capable(CAP_NET_RAW)) -+ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND)) ++ if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) return -EPERM; if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW && sock->type != SOCK_PACKET) -- 2.43.0