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-03-20 01:27:27.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-03-20 01:27:27.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-03-20 01:27:27.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-03-20 01:27:27.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-03-20 01:27:27.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-03-20 01:27:27.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-03-20 01:27:21.000000000 -0400
83 +++ linux-2.6.22-520/include/linux/vserver/network.h 2008-03-20 01:27:27.000000000 -0400
87 #define NXC_RAW_ICMP 0x00000100
88 +#define NXC_RAW_SOCKET 0x00000200
89 +#define NXC_RAW_SEND 0x00000400
93 --- linux-2.6.22-510/include/net/netfilter/nf_conntrack.h 2007-07-08 19:32:17.000000000 -0400
94 +++ linux-2.6.22-520/include/net/netfilter/nf_conntrack.h 2008-03-20 01:27:27.000000000 -0400
96 /* Storage reserved for other modules: */
97 union nf_conntrack_proto proto;
99 + /* PLANETLAB. VNET-specific */
100 + xid_t xid[IP_CT_DIR_MAX];
102 /* features dynamically at the end: helper, nat (both optional) */
105 diff -Nurb linux-2.6.22-510/include/net/raw.h linux-2.6.22-520/include/net/raw.h
106 --- linux-2.6.22-510/include/net/raw.h 2007-07-08 19:32:17.000000000 -0400
107 +++ linux-2.6.22-520/include/net/raw.h 2008-03-20 01:27:27.000000000 -0400
110 extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
111 __be32 raddr, __be32 laddr,
115 extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
117 diff -Nurb linux-2.6.22-510/net/core/skbuff.c linux-2.6.22-520/net/core/skbuff.c
118 --- linux-2.6.22-510/net/core/skbuff.c 2007-07-08 19:32:17.000000000 -0400
119 +++ linux-2.6.22-520/net/core/skbuff.c 2008-03-20 01:27:27.000000000 -0400
121 #include <linux/rtnetlink.h>
122 #include <linux/init.h>
123 #include <linux/scatterlist.h>
124 +#include <linux/vs_network.h>
126 #include <net/protocol.h>
130 skb_reset_tail_pointer(skb);
131 skb->end = skb->tail + size;
132 + skb->skb_tag = nx_current_nid();
133 /* make sure we initialize shinfo sequentially */
134 shinfo = skb_shinfo(skb);
135 atomic_set(&shinfo->dataref, 1);
140 + /* Sapan: Cloned skbs aren't owned by anyone. Let the cloner decide who it belongs to. */
142 atomic_inc(&(skb_shinfo(skb)->dataref));
146 new->tc_index = old->tc_index;
148 skb_copy_secmark(new, old);
149 + new->skb_tag = old->skb_tag;
150 atomic_set(&new->users, 1);
151 skb_shinfo(new)->gso_size = skb_shinfo(old)->gso_size;
152 skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs;
153 diff -Nurb linux-2.6.22-510/net/core/sock.c linux-2.6.22-520/net/core/sock.c
154 --- linux-2.6.22-510/net/core/sock.c 2008-03-20 01:27:22.000000000 -0400
155 +++ linux-2.6.22-520/net/core/sock.c 2008-03-20 01:27:27.000000000 -0400
161 + if (current_vx_info()) {
165 + if (val < 0 || val > MAX_S_CONTEXT) {
174 /* Don't error on this BSD doesn't and if you think
175 about it this is right. Otherwise apps have to
177 char devname[IFNAMSIZ];
180 - if (!capable(CAP_NET_RAW)) {
181 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
185 diff -Nurb linux-2.6.22-510/net/ipv4/af_inet.c linux-2.6.22-520/net/ipv4/af_inet.c
186 --- linux-2.6.22-510/net/ipv4/af_inet.c 2008-03-20 01:27:22.000000000 -0400
187 +++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-03-20 01:27:27.000000000 -0400
191 inet->sport = htons(inet->num);
192 + sk->sk_xid = vx_current_xid();
193 + sk->sk_nid = nx_current_nid();
198 if ((protocol == IPPROTO_ICMP) &&
199 nx_capable(answer->capability, NXC_RAW_ICMP))
201 + if (sock->type == SOCK_RAW &&
202 + nx_capable(answer->capability, NXC_RAW_SOCKET))
204 if (answer->capability > 0 && !capable(answer->capability))
207 diff -Nurb linux-2.6.22-510/net/ipv4/icmp.c linux-2.6.22-520/net/ipv4/icmp.c
208 --- linux-2.6.22-510/net/ipv4/icmp.c 2008-03-20 01:27:26.000000000 -0400
209 +++ linux-2.6.22-520/net/ipv4/icmp.c 2008-03-20 01:27:27.000000000 -0400
211 if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
212 while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
214 - skb->dev->ifindex)) != NULL) {
215 + skb->dev->ifindex, skb->skb_tag)) != NULL) {
216 raw_err(raw_sk, skb, info);
217 raw_sk = sk_next(raw_sk);
218 iph = (struct iphdr *)skb->data;
219 diff -Nurb linux-2.6.22-510/net/ipv4/ip_options.c linux-2.6.22-520/net/ipv4/ip_options.c
220 --- linux-2.6.22-510/net/ipv4/ip_options.c 2007-07-08 19:32:17.000000000 -0400
221 +++ linux-2.6.22-520/net/ipv4/ip_options.c 2008-03-20 01:27:27.000000000 -0400
226 - if (!skb && !capable(CAP_NET_RAW)) {
227 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
232 opt->router_alert = optptr - iph;
235 - if ((!skb && !capable(CAP_NET_RAW)) || opt->cipso) {
236 + if ((!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) || opt->cipso) {
244 - if (!skb && !capable(CAP_NET_RAW)) {
245 + if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
249 diff -Nurb linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c
250 --- linux-2.6.22-510/net/ipv4/netfilter/ipt_LOG.c 2008-03-20 01:27:10.000000000 -0400
251 +++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c 2008-03-20 01:27:27.000000000 -0400
254 logflags = NF_LOG_MASK;
256 + printk("TAG=%d ", skb->skb_tag);
258 ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
261 diff -Nurb linux-2.6.22-510/net/ipv4/raw.c linux-2.6.22-520/net/ipv4/raw.c
262 --- linux-2.6.22-510/net/ipv4/raw.c 2008-03-20 01:27:22.000000000 -0400
263 +++ linux-2.6.22-520/net/ipv4/raw.c 2008-03-20 01:27:27.000000000 -0400
266 struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
267 __be32 raddr, __be32 laddr,
271 struct hlist_node *node;
275 if (inet->num == num &&
276 !(inet->daddr && inet->daddr != raddr) &&
277 + (!sk->sk_nx_info || tag == 1 || sk->sk_nid == tag) &&
278 v4_sock_addr_match(sk->sk_nx_info, inet, laddr) &&
279 !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif))
280 goto found; /* gotcha */
283 sk = __raw_v4_lookup(__sk_head(head), iph->protocol,
284 iph->saddr, iph->daddr,
285 - skb->dev->ifindex);
286 + skb->dev->ifindex, skb->skb_tag);
292 sk = __raw_v4_lookup(sk_next(sk), iph->protocol,
293 iph->saddr, iph->daddr,
294 - skb->dev->ifindex);
295 + skb->dev->ifindex, skb->skb_tag);
298 read_unlock(&raw_v4_lock);
303 - if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) &&
304 + if (!nx_check(0, VS_ADMIN) && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET) &&
306 !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
308 diff -Nurb linux-2.6.22-510/net/netfilter/Kconfig linux-2.6.22-520/net/netfilter/Kconfig
309 --- linux-2.6.22-510/net/netfilter/Kconfig 2007-07-08 19:32:17.000000000 -0400
310 +++ linux-2.6.22-520/net/netfilter/Kconfig 2008-03-20 01:27:27.000000000 -0400
313 To compile it as a module, choose M here. If unsure, say N.
315 +config NETFILTER_XT_TARGET_SETXID
316 + tristate '"SETXID" target support'
317 + depends on NETFILTER_XTABLES
319 + This option adds a `SETXID' target, which allows you to alter the
322 config NETFILTER_XT_MATCH_COMMENT
323 tristate '"comment" match support'
324 depends on NETFILTER_XTABLES
325 diff -Nurb linux-2.6.22-510/net/netfilter/Makefile linux-2.6.22-520/net/netfilter/Makefile
326 --- linux-2.6.22-510/net/netfilter/Makefile 2007-07-08 19:32:17.000000000 -0400
327 +++ linux-2.6.22-520/net/netfilter/Makefile 2008-03-20 01:27:27.000000000 -0400
329 obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
332 +obj-$(CONFIG_NETFILTER_XT_TARGET_SETXID) += xt_SETXID.o
333 obj-$(CONFIG_NETFILTER_XT_TARGET_CLASSIFY) += xt_CLASSIFY.o
334 obj-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += xt_CONNMARK.o
335 obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
336 diff -Nurb linux-2.6.22-510/net/netfilter/nf_conntrack_core.c linux-2.6.22-520/net/netfilter/nf_conntrack_core.c
337 --- linux-2.6.22-510/net/netfilter/nf_conntrack_core.c 2007-07-08 19:32:17.000000000 -0400
338 +++ linux-2.6.22-520/net/netfilter/nf_conntrack_core.c 2008-03-20 01:27:27.000000000 -0400
341 /* Overload tuple linked list to put us in unconfirmed list. */
342 list_add(&conntrack->tuplehash[IP_CT_DIR_ORIGINAL].list, &unconfirmed);
343 + conntrack->xid[IP_CT_DIR_ORIGINAL] = -1;
344 + conntrack->xid[IP_CT_DIR_REPLY] = -1;
346 write_unlock_bh(&nf_conntrack_lock);
348 diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c linux-2.6.22-520/net/netfilter/xt_MARK.c
349 --- linux-2.6.22-510/net/netfilter/xt_MARK.c 2007-07-08 19:32:17.000000000 -0400
350 +++ linux-2.6.22-520/net/netfilter/xt_MARK.c 2008-03-20 01:30:14.000000000 -0400
352 * This program is free software; you can redistribute it and/or modify
353 * it under the terms of the GNU General Public License version 2 as
354 * published by the Free Software Foundation.
358 #include <linux/module.h>
359 +#include <linux/version.h>
360 #include <linux/skbuff.h>
361 #include <linux/ip.h>
362 #include <net/checksum.h>
363 +#include <net/route.h>
364 +#include <net/inet_hashtables.h>
366 +#include <net/netfilter/nf_conntrack.h>
367 #include <linux/netfilter/x_tables.h>
368 #include <linux/netfilter/xt_MARK.h>
371 MODULE_ALIAS("ipt_MARK");
372 MODULE_ALIAS("ip6t_MARK");
374 +static inline u_int16_t
375 +get_dst_port(struct nf_conntrack_tuple *tuple)
377 + switch (tuple->dst.protonum) {
379 + /* XXX Truncate 32-bit GRE key to 16 bits */
380 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
381 + return tuple->dst.u.gre.key;
383 + return htons(ntohl(tuple->dst.u.gre.key));
386 + /* Bind on ICMP echo ID */
387 + return tuple->src.u.icmp.id;
389 + return tuple->dst.u.tcp.port;
391 + return tuple->dst.u.udp.port;
393 + return tuple->dst.u.all;
397 +static inline u_int16_t
398 +get_src_port(struct nf_conntrack_tuple *tuple)
400 + switch (tuple->dst.protonum) {
402 + /* XXX Truncate 32-bit GRE key to 16 bits */
403 + return htons(ntohl(tuple->src.u.gre.key));
405 + /* Bind on ICMP echo ID */
406 + return tuple->src.u.icmp.id;
408 + return tuple->src.u.tcp.port;
410 + return tuple->src.u.udp.port;
412 + return tuple->src.u.all;
417 target_v0(struct sk_buff **pskb,
418 const struct net_device *in,
420 const void *targinfo)
422 const struct xt_mark_target_info_v1 *markinfo = targinfo;
426 switch (markinfo->mode) {
430 mark = (*pskb)->mark | markinfo->mark;
433 + case XT_MARK_COPYXID: {
434 + enum ip_conntrack_info ctinfo;
435 + struct sock *connection_sk;
438 + struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
439 + extern struct inet_hashinfo tcp_hashinfo;
440 + enum ip_conntrack_dir dir;
444 + dir = CTINFO2DIR(ctinfo);
445 + u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
446 + u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple);
447 + u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum;
452 + dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
453 + ip = ct->tuplehash[dir].tuple.dst.u3.ip;
454 + port = get_dst_port(&ct->tuplehash[dir].tuple);
456 + if (proto == 1 || proto == 17) {
457 + if (((*pskb)->mark!=-1) && (*pskb)->mark)
458 + ct->xid[0]=(*pskb)->mark;
463 + else if (proto == 6) {
466 + connection_sk = (*pskb)->sk;
468 + connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
471 + connection_sk = (*pskb)->sk;
473 + if (connection_sk) {
474 + connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
475 + ct->xid[!dir]=connection_sk->sk_xid;
476 + if (connection_sk->sk_xid != 0)
477 + mark = connection_sk->sk_xid;
478 + if (connection_sk != (*pskb)->sk)
479 + sock_put(connection_sk);
487 (*pskb)->mark = mark;
492 if (markinfo->mode != XT_MARK_SET
493 && markinfo->mode != XT_MARK_AND
494 - && markinfo->mode != XT_MARK_OR) {
495 + && markinfo->mode != XT_MARK_OR
496 + && markinfo->mode != XT_MARK_COPYXID) {
497 printk(KERN_WARNING "MARK: unknown mode %u\n",
500 --- linux-2.6.22-510/net/netfilter/xt_SETXID.c 1969-12-31 19:00:00.000000000 -0500
501 +++ linux-2.6.22-520/net/netfilter/xt_SETXID.c 2008-03-20 01:27:27.000000000 -0400
503 +#include <linux/module.h>
504 +#include <linux/skbuff.h>
505 +#include <linux/ip.h>
506 +#include <net/checksum.h>
507 +#include <linux/vs_network.h>
509 +#include <linux/netfilter/x_tables.h>
510 +#include <linux/netfilter/xt_SETXID.h>
512 +MODULE_LICENSE("GPL");
514 +MODULE_DESCRIPTION("");
515 +MODULE_ALIAS("ipt_SETXID");
518 +target_v1(struct sk_buff **pskb,
519 + const struct net_device *in,
520 + const struct net_device *out,
521 + unsigned int hooknum,
522 + const struct xt_target *target,
523 + const void *targinfo)
525 + const struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
527 + switch (setxidinfo->mode) {
528 + case XT_SET_PACKET_XID:
529 + (*pskb)->skb_tag = setxidinfo->mark;
532 + return XT_CONTINUE;
537 +checkentry_v1(const char *tablename,
539 + const struct xt_target *target,
541 + unsigned int hook_mask)
543 + struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
545 + if (setxidinfo->mode != XT_SET_PACKET_XID) {
546 + printk(KERN_WARNING "SETXID: unknown mode %u\n",
554 +static struct xt_target xt_setxid_target[] = {
559 + .checkentry = checkentry_v1,
560 + .target = target_v1,
561 + .targetsize = sizeof(struct xt_setxid_target_info_v1),
567 +static int __init init(void)
571 + err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
575 +static void __exit fini(void)
577 + xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
582 diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
583 --- linux-2.6.22-510/net/packet/af_packet.c 2007-07-08 19:32:17.000000000 -0400
584 +++ linux-2.6.22-520/net/packet/af_packet.c 2008-03-20 01:27:27.000000000 -0400
586 #include <linux/poll.h>
587 #include <linux/module.h>
588 #include <linux/init.h>
589 +#include <linux/vs_network.h>
592 #include <net/inet_common.h>
597 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
601 * Get and verify the address.
606 struct sk_filter *filter;
607 + int tag = skb->skb_tag;
609 + if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
613 filter = rcu_dereference(sk->sk_filter);
616 int ifindex, err, reserve = 0;
618 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
622 * Get and verify the address.
625 __be16 proto = (__force __be16)protocol; /* weird, but documented */
628 - if (!capable(CAP_NET_RAW))
629 + if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))
631 if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
632 sock->type != SOCK_PACKET)