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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:36.000000000 -0400
83 +++ linux-2.6.22-520/include/linux/vserver/network.h 2008-05-05 00:06:39.000000000 -0400
85 #define NXC_TUN_CREATE 0x00000001
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:39.000000000 -0400
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-05-05 00:06:36.000000000 -0400
156 +++ linux-2.6.22-520/net/core/sock.c 2008-05-05 00:06:39.000000000 -0400
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-05-05 00:06:36.000000000 -0400
188 +++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-05-05 00:06:39.000000000 -0400
192 inet->sport = htons(inet->num);
193 + sk->sk_xid = vx_current_xid();
194 + sk->sk_nid = nx_current_nid();
199 if ((protocol == IPPROTO_ICMP) &&
200 nx_capable(answer->capability, NXC_RAW_ICMP))
202 + if (sock->type == SOCK_RAW &&
203 + nx_capable(answer->capability, NXC_RAW_SOCKET))
205 if (answer->capability > 0 && !capable(answer->capability))
208 diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
209 --- linux-2.6.22-510/net/ipv4/icmp.c 2008-05-05 00:06:39.000000000 -0400
210 +++ linux-2.6.22-520/net/ipv4/icmp.c 2008-05-05 00:06:39.000000000 -0400
212 if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
213 while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
215 - skb->dev->ifindex)) != NULL) {
216 + skb->dev->ifindex, skb->skb_tag)) != NULL) {
217 raw_err(raw_sk, skb, info);
218 raw_sk = sk_next(raw_sk);
219 iph = (struct iphdr *)skb->data;
220 diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
221 --- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400
222 +++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-05-05 00:06:39.000000000 -0400
227 - if (!skb && !capable(CAP_NET_RAW)) {
228 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
233 opt->router_alert = optptr - iph;
236 - if ((!skb && !capable(CAP_NET_RAW)) || opt->cipso) {
237 + if ((!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) || opt->cipso) {
245 - if (!skb && !capable(CAP_NET_RAW)) {
246 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
250 diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
251 --- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-05-05 00:06:26.000000000 -0400
252 +++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-05-05 00:06:39.000000000 -0400
255 logflags = NF_LOG_MASK;
257 + printk("TAG=%d ", skb->skb_tag);
259 ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
262 diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
263 --- linux-2.6.22-510/net/ipv4/raw.c 2008-05-05 00:06:36.000000000 -0400
264 +++ linux-2.6.22-520/net/ipv4/raw.c 2008-05-05 00:06:39.000000000 -0400
267 struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
268 __be32 raddr, __be32 laddr,
272 struct hlist_node *node;
276 if (inet->num == num &&
277 !(inet->daddr && inet->daddr != raddr) &&
278 + (!sk->sk_nx_info || tag == 1 || sk->sk_nid == tag) &&
279 v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
280 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
281 goto found; /* gotcha */
284 sk = __raw_v4_lookup(__sk_head(head), iph->protocol,
285 iph->saddr, iph->daddr,
286 - skb->dev->ifindex);
287 + skb->dev->ifindex, skb->skb_tag);
293 sk = __raw_v4_lookup(sk_next(sk), iph->protocol,
294 iph->saddr, iph->daddr,
295 - skb->dev->ifindex);
296 + skb->dev->ifindex, skb->skb_tag);
299 read_unlock(&raw_v4_lock);
304 - if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
305 + if (!nx_check(0, VS_ADMIN) && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET) &&
307 !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
309 diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
310 --- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
311 +++ linux-2.6.22-520/net/netfilter/Kconfig 2008-05-05 00:06:39.000000000 -0400
314 To compile it as a module, choose M here. If unsure, say N.
316 +config NETFILTER_XT_TARGET_SETXID
317 + tristate '"SETXID" target support'
318 + depends on NETFILTER_XTABLES
320 + This option adds a `SETXID' target, which allows you to alter the
323 config NETFILTER_XT_MATCH_COMMENT
324 tristate '"comment" match support'
325 depends on NETFILTER_XTABLES
326 diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
327 --- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
328 +++ linux-2.6.22-520/net/netfilter/Makefile 2008-05-05 00:06:39.000000000 -0400
330 obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
333 +obj-$(CONFIG_NETFILTER_XT_TARGET_SETXID) += xt_SETXID.o
334 obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
335 obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
336 obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
337 diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
338 --- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
339 +++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-05-05 00:06:39.000000000 -0400
342 /* Overload tuple linked list to put us in unconfirmed list. */
343 list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
344 + conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
345 + conntrack->xid[IP_CT_DIR_REPLY] = -1;
347 write_unlock_bh(&nf_conntrack_lock);
349 diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
350 --- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
351 +++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-05-09 14:09:29.000000000 -0400
353 * This program is free software; you can redistribute it and/or modify
354 * it under the terms of the GNU General Public License version 2 as
355 * published by the Free Software Foundation.
359 #include <linux/module.h>
360 +#include <linux/version.h>
361 #include <linux/skbuff.h>
362 #include <linux/ip.h>
363 #include <net/checksum.h>
364 +#include <net/route.h>
365 +#include <net/inet_hashtables.h>
367 +#include <net/netfilter/nf_conntrack.h>
368 #include <linux/netfilter/x_tables.h>
369 #include <linux/netfilter/xt_MARK.h>
372 MODULE_ALIAS("ipt_MARK");
373 MODULE_ALIAS("ip6t_MARK");
375 +static inline u_int16_t
376 +get_dst_port(struct nf_conntrack_tuple *tuple)
378 + switch (tuple->dst.protonum) {
380 + /* XXX Truncate 32-bit GRE key to 16 bits */
381 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
382 + return tuple->dst.u.gre.key;
384 + return htons(ntohl(tuple->dst.u.gre.key));
387 + /* Bind on ICMP echo ID */
388 + return tuple->src.u.icmp.id;
390 + return tuple->dst.u.tcp.port;
392 + return tuple->dst.u.udp.port;
394 + return tuple->dst.u.all;
398 +static inline u_int16_t
399 +get_src_port(struct nf_conntrack_tuple *tuple)
401 + switch (tuple->dst.protonum) {
403 + /* XXX Truncate 32-bit GRE key to 16 bits */
404 + return htons(ntohl(tuple->src.u.gre.key));
406 + /* Bind on ICMP echo ID */
407 + return tuple->src.u.icmp.id;
409 + return tuple->src.u.tcp.port;
411 + return tuple->src.u.udp.port;
413 + return tuple->src.u.all;
418 target_v0(struct sk_buff **pskb,
419 const struct net_device *in,
421 const void *targinfo)
423 const struct xt_mark_target_info_v1 *markinfo = targinfo;
425 + struct nf_conn *ct;
427 + extern struct inet_hashinfo tcp_hashinfo;
428 + enum ip_conntrack_dir dir;
430 + u_int16_t src_port;
436 switch (markinfo->mode) {
440 mark = (*pskb)->mark | markinfo->mark;
443 + case XT_MARK_COPYXID: {
444 + enum ip_conntrack_info ctinfo;
445 + struct sock *connection_sk;
448 + ct = nf_ct_get((*pskb), &ctinfo);
452 + dir = CTINFO2DIR(ctinfo);
453 + src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
454 + src_port = get_src_port(&ct->tuplehash[dir].tuple);
455 + proto = ct->tuplehash[dir].tuple.dst.protonum;
457 + dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
458 + ip = ct->tuplehash[dir].tuple.dst.u3.ip;
459 + port = get_dst_port(&ct->tuplehash[dir].tuple);
461 + if (proto == 1 || proto == 17) {
462 + if (((*pskb)->mark!=-1) && (*pskb)->mark)
463 + ct->xid[0]=(*pskb)->mark;
468 + else if (proto == 6) {
470 + connection_sk = (*pskb)->sk;
471 + sock_hold(connection_sk);
474 + connection_sk = inet_lookup_established(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
477 + if (connection_sk) {
478 + if (connection_sk->sk_state == TCP_TIME_WAIT) {
479 + inet_twsk_put(inet_twsk(connection_sk));
482 + connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
483 + ct->xid[!dir]=connection_sk->sk_xid;
484 + if (connection_sk->sk_xid != 0)
485 + mark = connection_sk->sk_xid;
486 + sock_put(connection_sk);
494 (*pskb)->mark = mark;
499 if (markinfo->mode != XT_MARK_SET
500 && markinfo->mode != XT_MARK_AND
501 - && markinfo->mode != XT_MARK_OR) {
502 + && markinfo->mode != XT_MARK_OR
503 + && markinfo->mode != XT_MARK_COPYXID) {
504 printk(KERN_WARNING "MARK: unknown mode %u\n",
507 diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
508 --- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
509 +++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-05-05 00:06:39.000000000 -0400
511 +#include <linux/module.h>
512 +#include <linux/skbuff.h>
513 +#include <linux/ip.h>
514 +#include <net/checksum.h>
515 +#include <linux/vs_network.h>
517 +#include <linux/netfilter/x_tables.h>
518 +#include <linux/netfilter/xt_SETXID.h>
520 +MODULE_LICENSE("GPL");
522 +MODULE_DESCRIPTION("");
523 +MODULE_ALIAS("ipt_SETXID");
526 +target_v1(struct sk_buff **pskb,
527 + const struct net_device *in,
528 + const struct net_device *out,
529 + unsigned int hooknum,
530 + const struct xt_target *target,
531 + const void *targinfo)
533 + const struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
535 + switch (setxidinfo->mode) {
536 + case XT_SET_PACKET_XID:
537 + (*pskb)->skb_tag = setxidinfo->mark;
540 + return XT_CONTINUE;
545 +checkentry_v1(const char *tablename,
547 + const struct xt_target *target,
549 + unsigned int hook_mask)
551 + struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
553 + if (setxidinfo->mode != XT_SET_PACKET_XID) {
554 + printk(KERN_WARNING "SETXID: unknown mode %u\n",
562 +static struct xt_target xt_setxid_target[] = {
567 + .checkentry = checkentry_v1,
568 + .target = target_v1,
569 + .targetsize = sizeof(struct xt_setxid_target_info_v1),
575 +static int __init init(void)
579 + err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
583 +static void __exit fini(void)
585 + xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
590 diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
591 --- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
592 +++ linux-2.6.22-520/net/packet/af_packet.c 2008-05-05 00:06:39.000000000 -0400
594 #include <linux/poll.h>
595 #include <linux/module.h>
596 #include <linux/init.h>
597 +#include <linux/vs_network.h>
600 #include <net/inet_common.h>
605 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
609 * Get and verify the address.
614 struct sk_filter *filter;
615 + int tag = skb->skb_tag;
617 + if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
621 filter = rcu_dereference(sk->sk_filter);
624 int ifindex, err, reserve = 0;
626 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
630 * Get and verify the address.
633 __be16 proto = (__force __be16)protocol; /* weird, but documented */
636 - if (!capable(CAP_NET_RAW))
637 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))
639 if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
640 sock->type != SOCK_PACKET)