1 diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_MARK.h linux-2.6.22-520/include/linux/netfilter/xt_MARK.h
2 --- linux-2.6.22-510/include/linux/netfilter/xt_MARK.h 2007-07-08 19:32:17.000000000 -0400
3 +++ linux-2.6.22-520/include/linux/netfilter/xt_MARK.h 2008-02-02 04:52:17.000000000 -0500
11 struct xt_mark_target_info_v1 {
12 diff -Nurb linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h
13 --- linux-2.6.22-510/include/linux/netfilter/xt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
14 +++ linux-2.6.22-520/include/linux/netfilter/xt_SETXID.h 2008-02-02 04:52:17.000000000 -0500
16 +#ifndef _XT_SETXID_H_target
17 +#define _XT_SETXID_H_target
24 +struct xt_setxid_target_info_v1 {
29 +#endif /*_XT_SETXID_H_target*/
30 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
31 --- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_MARK.h 2007-07-08 19:32:17.000000000 -0400
32 +++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_MARK.h 2008-02-02 04:52:17.000000000 -0500
34 #define IPT_MARK_SET XT_MARK_SET
35 #define IPT_MARK_AND XT_MARK_AND
36 #define IPT_MARK_OR XT_MARK_OR
37 +#define IPT_MARK_COPYXID XT_MARK_COPYXID
39 #define ipt_mark_target_info_v1 xt_mark_target_info_v1
41 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
42 --- linux-2.6.22-510/include/linux/netfilter_ipv4/ipt_SETXID.h 1969-12-31 19:00:00.000000000 -0500
43 +++ linux-2.6.22-520/include/linux/netfilter_ipv4/ipt_SETXID.h 2008-02-02 04:52:17.000000000 -0500
45 +#ifndef _IPT_SETXID_H_target
46 +#define _IPT_SETXID_H_target
48 +/* Backwards compatibility for old userspace */
50 +#include <linux/netfilter/xt_SETXID.h>
53 +#define IPT_SET_PACKET_XID XT_SET_PACKET_XID
55 +#define ipt_setxid_target_info_v1 xt_setxid_target_info_v1
57 +#endif /*_IPT_SETXID_H_target*/
58 diff -Nurb linux-2.6.22-510/include/linux/skbuff.h linux-2.6.22-520/include/linux/skbuff.h
59 --- linux-2.6.22-510/include/linux/skbuff.h 2007-07-08 19:32:17.000000000 -0400
60 +++ linux-2.6.22-520/include/linux/skbuff.h 2008-02-02 04:52:17.000000000 -0500
67 sk_buff_data_t transport_header;
68 sk_buff_data_t network_header;
69 diff -Nurb linux-2.6.22-510/include/linux/socket.h linux-2.6.22-520/include/linux/socket.h
70 --- linux-2.6.22-510/include/linux/socket.h 2007-07-08 19:32:17.000000000 -0400
71 +++ linux-2.6.22-520/include/linux/socket.h 2008-02-02 04:52:17.000000000 -0500
76 +#define SO_SETXID SO_PEERCRED
81 diff -Nurb linux-2.6.22-510/include/linux/vserver/network.h linux-2.6.22-520/include/linux/vserver/network.h
82 --- linux-2.6.22-510/include/linux/vserver/network.h 2008-02-02 04:52:13.000000000 -0500
83 +++ linux-2.6.22-520/include/linux/vserver/network.h 2008-02-02 04:52:17.000000000 -0500
87 #define NXC_RAW_ICMP 0x00000100
88 +#define NXC_RAW_SOCKET 0x00000200
89 +#define NXC_RAW_SEND 0x00000400
93 diff -Nurb linux-2.6.22-510/include/net/netfilter/nf_conntrack.h linux-2.6.22-520/include/net/netfilter/nf_conntrack.h
94 --- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400
95 +++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-02-02 04:52:17.000000000 -0500
97 /* Storage reserved for other modules: */
98 union nf_conntrack_proto proto;
100 + /* PLANETLAB. VNET-specific */
101 + xid_t xid[IP_CT_DIR_MAX];
103 /* features dynamically at the end: helper, nat (both optional) */
106 diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
107 --- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400
108 +++ linux-2.6.22-520/include/net/raw.h 2008-02-02 04:52:17.000000000 -0500
111 extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
112 __be32 raddr, __be32 laddr,
116 extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
118 diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
119 --- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
120 +++ linux-2.6.22-520/net/core/skbuff.c 2008-02-02 04:52:17.000000000 -0500
122 #include <linux/rtnetlink.h>
123 #include <linux/init.h>
124 #include <linux/scatterlist.h>
125 +#include <linux/vs_network.h>
127 #include <net/protocol.h>
131 skb_reset_tail_pointer(skb);
132 skb->end = skb->tail + size;
133 + skb->skb_tag = nx_current_nid();
134 /* make sure we initialize shinfo sequentially */
135 shinfo = skb_shinfo(skb);
136 atomic_set(&shinfo->dataref, 1);
141 + /* Sapan: Cloned skbs aren't owned by anyone. Let the cloner decide who it belongs to. */
143 atomic_inc(&(skb_shinfo(skb)->dataref));
147 new->tc_index = old->tc_index;
149 skb_copy_secmark(new, old);
150 + new->skb_tag = old->skb_tag;
151 atomic_set(&new->users, 1);
152 skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
153 skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
154 diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
155 --- linux-2.6.22-510/net/core/sock.c 2008-02-02 04:52:13.000000000 -0500
156 +++ linux-2.6.22-520/net/core/sock.c 2008-02-02 04:52:17.000000000 -0500
162 + if (current_vx_info()) {
166 + if (val < 0 || val > MAX_S_CONTEXT) {
175 /* Don't error on this BSD doesn't and if you think
176 about it this is right. Otherwise apps have to
178 char devname[IFNAMSIZ];
181 - if (!capable(CAP_NET_RAW)) {
182 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
186 diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
187 --- linux-2.6.22-510/net/ipv4/af_inet.c 2008-02-02 04:52:13.000000000 -0500
188 +++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-02-02 04:52:17.000000000 -0500
192 inet->sport = htons(inet->num);
193 + sk->sk_xid = vx_current_xid();
194 + sk->sk_nid = nx_current_nid();
198 diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
199 --- linux-2.6.22-510/net/ipv4/icmp.c 2008-02-02 04:52:16.000000000 -0500
200 +++ linux-2.6.22-520/net/ipv4/icmp.c 2008-02-02 04:52:17.000000000 -0500
202 if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
203 while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
205 - skb->dev->ifindex)) != NULL) {
206 + skb->dev->ifindex, skb->skb_tag)) != NULL) {
207 raw_err(raw_sk, skb, info);
208 raw_sk = sk_next(raw_sk);
209 iph = (struct iphdr *)skb->data;
210 diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
211 --- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400
212 +++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-02-02 04:52:17.000000000 -0500
217 - if (!skb && !capable(CAP_NET_RAW)) {
218 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
223 opt->router_alert = optptr - iph;
226 - if ((!skb && !capable(CAP_NET_RAW)) || opt->cipso) {
227 + if ((!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) || opt->cipso) {
235 - if (!skb && !capable(CAP_NET_RAW)) {
236 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
240 diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
241 --- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-02-02 04:52:09.000000000 -0500
242 +++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-02-02 04:52:17.000000000 -0500
245 logflags = NF_LOG_MASK;
247 + printk("TAG=%d ", skb->skb_tag);
249 ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
252 diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
253 --- linux-2.6.22-510/net/ipv4/raw.c 2008-02-02 04:52:13.000000000 -0500
254 +++ linux-2.6.22-520/net/ipv4/raw.c 2008-02-02 04:52:17.000000000 -0500
257 struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
258 __be32 raddr, __be32 laddr,
262 struct hlist_node *node;
266 if (inet->num == num &&
267 !(inet->daddr && inet->daddr != raddr) &&
268 + (!sk->sk_nx_info || tag == 1 || sk->sk_nid == tag) &&
269 v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
270 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
271 goto found; /* gotcha */
274 sk = __raw_v4_lookup(__sk_head(head), iph->protocol,
275 iph->saddr, iph->daddr,
276 - skb->dev->ifindex);
277 + skb->dev->ifindex, skb->skb_tag);
283 sk = __raw_v4_lookup(sk_next(sk), iph->protocol,
284 iph->saddr, iph->daddr,
285 - skb->dev->ifindex);
286 + skb->dev->ifindex, skb->skb_tag);
289 read_unlock(&raw_v4_lock);
294 - if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
295 + if (!nx_check(0, VS_ADMIN) && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET) &&
297 !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
299 diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
300 --- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
301 +++ linux-2.6.22-520/net/netfilter/Kconfig 2008-02-02 04:52:17.000000000 -0500
304 To compile it as a module, choose M here. If unsure, say N.
306 +config NETFILTER_XT_TARGET_SETXID
307 + tristate '"SETXID" target support'
308 + depends on NETFILTER_XTABLES
310 + This option adds a `SETXID' target, which allows you to alter the
313 config NETFILTER_XT_MATCH_COMMENT
314 tristate '"comment" match support'
315 depends on NETFILTER_XTABLES
316 diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
317 --- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
318 +++ linux-2.6.22-520/net/netfilter/Makefile 2008-02-02 04:52:17.000000000 -0500
320 obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
323 +obj-$(CONFIG_NETFILTER_XT_TARGET_SETXID) += xt_SETXID.o
324 obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
325 obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
326 obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
327 diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
328 --- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
329 +++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-02-02 04:52:17.000000000 -0500
332 /* Overload tuple linked list to put us in unconfirmed list. */
333 list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
334 + conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
335 + conntrack->xid[IP_CT_DIR_REPLY] = -1;
337 write_unlock_bh(&nf_conntrack_lock);
339 diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
340 --- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
341 +++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-02-08 06:20:11.000000000 -0500
343 * This program is free software; you can redistribute it and/or modify
344 * it under the terms of the GNU General Public License version 2 as
345 * published by the Free Software Foundation.
349 #include <linux/module.h>
350 +#include <linux/version.h>
351 #include <linux/skbuff.h>
352 #include <linux/ip.h>
353 #include <net/checksum.h>
354 +#include <net/route.h>
355 +#include <net/inet_hashtables.h>
357 +#include <net/netfilter/nf_conntrack.h>
358 #include <linux/netfilter/x_tables.h>
359 #include <linux/netfilter/xt_MARK.h>
362 MODULE_ALIAS("ipt_MARK");
363 MODULE_ALIAS("ip6t_MARK");
365 +static inline u_int16_t
366 +get_dst_port(struct nf_conntrack_tuple *tuple)
368 + switch (tuple->dst.protonum) {
370 + /* XXX Truncate 32-bit GRE key to 16 bits */
371 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
372 + return tuple->dst.u.gre.key;
374 + return htons(ntohl(tuple->dst.u.gre.key));
377 + /* Bind on ICMP echo ID */
378 + return tuple->src.u.icmp.id;
380 + return tuple->dst.u.tcp.port;
382 + return tuple->dst.u.udp.port;
384 + return tuple->dst.u.all;
388 +static inline u_int16_t
389 +get_src_port(struct nf_conntrack_tuple *tuple)
391 + switch (tuple->dst.protonum) {
393 + /* XXX Truncate 32-bit GRE key to 16 bits */
394 + return htons(ntohl(tuple->src.u.gre.key));
396 + /* Bind on ICMP echo ID */
397 + return tuple->src.u.icmp.id;
399 + return tuple->src.u.tcp.port;
401 + return tuple->src.u.udp.port;
403 + return tuple->src.u.all;
408 target_v0(struct sk_buff **pskb,
409 const struct net_device *in,
411 const void *targinfo)
413 const struct xt_mark_target_info_v1 *markinfo = targinfo;
417 switch (markinfo->mode) {
421 mark = (*pskb)->mark | markinfo->mark;
424 + case XT_MARK_COPYXID: {
425 + enum ip_conntrack_info ctinfo;
426 + struct sock *connection_sk;
429 + struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
430 + extern struct inet_hashinfo tcp_hashinfo;
431 + enum ip_conntrack_dir dir;
435 + dir = CTINFO2DIR(ctinfo);
436 + u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
437 + u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple);
442 + dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
443 + ip = ct->tuplehash[dir].tuple.dst.u3.ip;
444 + port = get_dst_port(&ct->tuplehash[dir].tuple);
447 + connection_sk = (*pskb)->sk;
449 + connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
452 + if (connection_sk) {
453 + connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
454 + ct->xid[!dir]=connection_sk->sk_xid;
455 + connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_sk->sk_xid;
456 + if (connection_sk->sk_xid != 0)
457 + mark = connection_sk->sk_xid;
458 + if (connection_sk != (*pskb)->sk)
459 + sock_put(connection_sk);
466 (*pskb)->mark = mark;
471 if (markinfo->mode != XT_MARK_SET
472 && markinfo->mode != XT_MARK_AND
473 - && markinfo->mode != XT_MARK_OR) {
474 + && markinfo->mode != XT_MARK_OR
475 + && markinfo->mode != XT_MARK_COPYXID) {
476 printk(KERN_WARNING "MARK: unknown mode %u\n",
479 diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
480 --- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
481 +++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-02-02 04:52:17.000000000 -0500
483 +#include <linux/module.h>
484 +#include <linux/skbuff.h>
485 +#include <linux/ip.h>
486 +#include <net/checksum.h>
487 +#include <linux/vs_network.h>
489 +#include <linux/netfilter/x_tables.h>
490 +#include <linux/netfilter/xt_SETXID.h>
492 +MODULE_LICENSE("GPL");
494 +MODULE_DESCRIPTION("");
495 +MODULE_ALIAS("ipt_SETXID");
498 +target_v1(struct sk_buff **pskb,
499 + const struct net_device *in,
500 + const struct net_device *out,
501 + unsigned int hooknum,
502 + const struct xt_target *target,
503 + const void *targinfo)
505 + const struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
507 + switch (setxidinfo->mode) {
508 + case XT_SET_PACKET_XID:
509 + (*pskb)->skb_tag = setxidinfo->mark;
512 + return XT_CONTINUE;
517 +checkentry_v1(const char *tablename,
519 + const struct xt_target *target,
521 + unsigned int hook_mask)
523 + struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
525 + if (setxidinfo->mode != XT_SET_PACKET_XID) {
526 + printk(KERN_WARNING "SETXID: unknown mode %u\n",
534 +static struct xt_target xt_setxid_target[] = {
539 + .checkentry = checkentry_v1,
540 + .target = target_v1,
541 + .targetsize = sizeof(struct xt_setxid_target_info_v1),
547 +static int __init init(void)
551 + err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
555 +static void __exit fini(void)
557 + xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
562 diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
563 --- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
564 +++ linux-2.6.22-520/net/packet/af_packet.c 2008-02-02 04:52:17.000000000 -0500
566 #include <linux/poll.h>
567 #include <linux/module.h>
568 #include <linux/init.h>
569 +#include <linux/vs_network.h>
572 #include <net/inet_common.h>
576 struct sk_filter *filter;
577 + int tag = skb->skb_tag;
579 + if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
583 filter = rcu_dereference(sk->sk_filter);
585 __be16 proto = (__force __be16)protocol; /* weird, but documented */
588 - if (!capable(CAP_NET_RAW))
589 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
591 if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
592 sock->type != SOCK_PACKET)