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
++++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-05-05 00:06:39.000000000 -0400
@@ -11,6 +11,7 @@
XT_MARK_SET=0,
XT_MARK_AND,
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
++++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-05-05 00:06:39.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _XT_SETXID_H_target
+#define _XT_SETXID_H_target
+#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
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-05-05 00:06:39.000000000 -0400
@@ -12,6 +12,7 @@
#define IPT_MARK_SET XT_MARK_SET
#define IPT_MARK_AND XT_MARK_AND
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
++++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-05-05 00:06:39.000000000 -0400
@@ -0,0 +1,13 @@
+#ifndef _IPT_SETXID_H_target
+#define _IPT_SETXID_H_target
+#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
++++ linux-2.6.22-520/include/linux/skbuff.h 2008-05-05 00:06:39.000000000 -0400
@@ -302,6 +302,7 @@
#endif
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
++++ linux-2.6.22-520/include/linux/socket.h 2008-05-05 00:06:39.000000000 -0400
@@ -288,6 +288,8 @@
#define SOL_TIPC 271
#define SOL_RXRPC 272
#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 @@
- /* network caps */
+--- linux-2.6.22-510/include/linux/vserver/network.h 2008-05-05 00:06:36.000000000 -0400
++++ linux-2.6.22-520/include/linux/vserver/network.h 2008-05-05 00:06:39.000000000 -0400
+@@ -47,6 +47,8 @@
+ #define NXC_TUN_CREATE 0x00000001
#define NXC_RAW_ICMP 0x00000100
+#define NXC_RAW_SOCKET 0x00000200
/* 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
++++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-05-05 00:06:39.000000000 -0400
@@ -131,6 +131,9 @@
/* Storage reserved for other modules: */
union nf_conntrack_proto proto;
};
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
++++ linux-2.6.22-520/include/net/raw.h 2008-05-05 00:06:39.000000000 -0400
@@ -36,7 +36,7 @@
extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
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
++++ linux-2.6.22-520/net/core/skbuff.c 2008-05-05 00:06:39.000000000 -0400
@@ -56,6 +56,7 @@
#include <linux/rtnetlink.h>
#include <linux/init.h>
skb->data = data;
skb_reset_tail_pointer(skb);
skb->end = skb->tail + size;
-+ skb->skb_tag = nx_current_nid();
++ if (!in_interrupt()) skb->skb_tag = nx_current_nid();
/* make sure we initialize shinfo sequentially */
shinfo = skb_shinfo(skb);
atomic_set(&shinfo->dataref, 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
+--- linux-2.6.22-510/net/core/sock.c 2008-05-05 00:06:36.000000000 -0400
++++ linux-2.6.22-520/net/core/sock.c 2008-05-05 00:06:39.000000000 -0400
@@ -444,6 +444,19 @@
}
goto set_sndbuf;
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
+--- linux-2.6.22-510/net/ipv4/af_inet.c 2008-05-05 00:06:36.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-05-05 00:06:39.000000000 -0400
@@ -178,6 +178,8 @@
return -EAGAIN;
}
inet->sport = htons(inet->num);
+ sk->sk_xid = vx_current_xid();
-+ sk->sk_nid = nx_current_nid();
++ if (!in_interrupt()) sk->sk_nid = nx_current_nid();
}
release_sock(sk);
return 0;
+@@ -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-02-02 04:52:16.000000000 -0500
-+++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-02 04:52:17.000000000 -0500
+--- linux-2.6.22-510/net/ipv4/icmp.c 2008-05-05 00:06:39.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/icmp.c 2008-05-05 00:06:39.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 = (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
++++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-05-05 00:06:39.000000000 -0400
@@ -409,7 +409,7 @@
optptr[2] += 8;
break;
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
+--- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-05-05 00:06:26.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-05-05 00:06:39.000000000 -0400
@@ -49,6 +49,8 @@
else
logflags = NF_LOG_MASK;
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
+--- linux-2.6.22-510/net/ipv4/raw.c 2008-05-05 00:06:36.000000000 -0400
++++ linux-2.6.22-520/net/ipv4/raw.c 2008-05-05 00:06:39.000000000 -0400
@@ -103,7 +103,7 @@
struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
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
++++ linux-2.6.22-520/net/netfilter/Kconfig 2008-05-05 00:06:39.000000000 -0400
@@ -389,6 +389,13 @@
To compile it as a module, choose M here. If unsure, say N.
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
++++ linux-2.6.22-520/net/netfilter/Makefile 2008-05-05 00:06:39.000000000 -0400
@@ -37,6 +37,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.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
++++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-05-05 00:06:39.000000000 -0400
@@ -726,6 +726,8 @@
/* Overload tuple linked list to put us in unconfirmed list. */
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
++++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-05-09 16:59:26.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
static unsigned int
target_v0(struct sk_buff **pskb,
const struct net_device *in,
-@@ -44,7 +91,7 @@
+@@ -44,7 +91,19 @@
const void *targinfo)
{
const struct xt_mark_target_info_v1 *markinfo = targinfo;
- int mark = 0;
++ enum ip_conntrack_info ctinfo;
++ struct sock *connection_sk;
++ int dif;
++ struct nf_conn *ct;
++ extern struct inet_hashinfo tcp_hashinfo;
++ enum ip_conntrack_dir dir;
++ u_int32_t src_ip;
++ u_int32_t dst_ip;
++ u_int16_t proto, src_port;
++ u_int32_t ip;
++ u_int16_t port;
++
+ int mark = -1;
switch (markinfo->mode) {
case XT_MARK_SET:
-@@ -58,8 +105,49 @@
+@@ -58,8 +117,63 @@
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;
++ case XT_MARK_COPYXID:
++
++ ct = nf_ct_get((*pskb), &ctinfo);
++ if (!ct)
++ break;
+
-+ struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
-+ extern struct inet_hashinfo tcp_hashinfo;
-+ enum ip_conntrack_dir dir;
++ dir = CTINFO2DIR(ctinfo);
++ src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
++ dst_ip = ct->tuplehash[dir].tuple.dst.u3.ip;
++ src_port = get_src_port(&ct->tuplehash[dir].tuple);
++ proto = ct->tuplehash[dir].tuple.dst.protonum;
+
-+ 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);
++ dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
++ ip = ct->tuplehash[dir].tuple.dst.u3.ip;
++ port = get_dst_port(&ct->tuplehash[dir].tuple);
+
-+ 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 ((*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) {
++ /* Temporary hack for robustness against wrong xid values */
++ if (((*pskb)->mark!=-1) && (*pskb)->mark && ct->xid[0]==-1 && (hooknum != NF_IP_LOCAL_IN))
++ ct->xid[0]=(*pskb)->mark;
++ if (ct->xid[0])
++ mark = ct->xid[0];
+
-+ if (connection_sk) {
-+ 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;
-+ if (connection_sk != (*pskb)->sk)
-+ sock_put(connection_sk);
-+ }
-+ break;
-+ }
}
-
++ else if (proto == 6) {
++ if ((*pskb)->sk) {
++ connection_sk = (*pskb)->sk;
++ sock_hold(connection_sk);
++ }
++ else
++ connection_sk = inet_lookup_established(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
++
+
++ if (connection_sk) {
++ if (connection_sk->sk_state == TCP_TIME_WAIT) {
++ inet_twsk_put(inet_twsk(connection_sk));
++ break;
++ }
++ 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;
++ else if (hooknum == NF_IP_LOCAL_IN) {
++ /* Neutralize packets in incognito */
++ mark = -1;
++ }
++ sock_put(connection_sk);
++ }
++ else
++ mark = -1 ;
++ }
++ break;
++ }
+ if (mark != -1)
(*pskb)->mark = mark;
return XT_CONTINUE;
}
-@@ -92,7 +180,8 @@
+@@ -92,7 +206,8 @@
if (markinfo->mode != XT_MARK_SET
&& markinfo->mode != XT_MARK_AND
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
++++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-05-05 00:06:39.000000000 -0400
@@ -0,0 +1,79 @@
+#include <linux/module.h>
+#include <linux/skbuff.h>
+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
++++ linux-2.6.22-520/net/packet/af_packet.c 2008-05-05 00:06:39.000000000 -0400
@@ -78,6 +78,7 @@
#include <linux/poll.h>
#include <linux/module.h>
#ifdef CONFIG_INET
#include <net/inet_common.h>
-@@ -420,6 +421,10 @@
+@@ -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;
rcu_read_lock_bh();
filter = rcu_dereference(sk->sk_filter);
-@@ -984,7 +989,7 @@
+@@ -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)
git://git.onelab.eu / linux-2.6.git / blobdiff