linux-2.6-520-vnet+.patch

   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-04-20 20:06:33.000000000 -0400
   4 @@ -11,6 +11,7 @@
   5         XT_MARK_SET=0,
   6         XT_MARK_AND,
   7         XT_MARK_OR,
   8 +       XT_MARK_COPYXID,
   9  };
  10
  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-04-20 20:06:33.000000000 -0400
  15 @@ -0,0 +1,14 @@
  16 +#ifndef _XT_SETXID_H_target
  17 +#define _XT_SETXID_H_target
  18 +
  19 +/* Version 1 */
  20 +enum {
  21 +       XT_SET_PACKET_XID=0
  22 +};
  23 +
  24 +struct xt_setxid_target_info_v1 {
  25 +       unsigned long mark;
  26 +       u_int8_t mode;
  27 +};
  28 +
  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-04-20 20:06:33.000000000 -0400
  33 @@ -12,6 +12,7 @@
  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
  38
  39  #define ipt_mark_target_info_v1 xt_mark_target_info_v1
  40
  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-04-20 20:06:33.000000000 -0400
  44 @@ -0,0 +1,13 @@
  45 +#ifndef _IPT_SETXID_H_target
  46 +#define _IPT_SETXID_H_target
  47 +
  48 +/* Backwards compatibility for old userspace */
  49 +
  50 +#include <linux/netfilter/xt_SETXID.h>
  51 +
  52 +/* Version 1 */
  53 +#define IPT_SET_PACKET_XID     XT_SET_PACKET_XID
  54 +
  55 +#define ipt_setxid_target_info_v1 xt_setxid_target_info_v1
  56 +
  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-04-20 20:06:33.000000000 -0400
  61 @@ -302,6 +302,7 @@
  62  #endif
  63
  64         __u32                   mark;
  65 +#define skb_tag                        mark
  66
  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-04-20 20:06:33.000000000 -0400
  72 @@ -288,6 +288,8 @@
  73  #define SOL_TIPC       271
  74  #define SOL_RXRPC      272
  75
  76 +#define SO_SETXID      SO_PEERCRED
  77 +
  78  /* IPX options */
  79  #define IPX_TYPE       1
  80
  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-04-20 20:06:30.000000000 -0400
  83 +++ linux-2.6.22-520/include/linux/vserver/network.h    2008-04-20 20:06:33.000000000 -0400
  84 @@ -47,6 +47,8 @@
  85  #define NXC_TUN_CREATE         0x00000001
  86
  87  #define NXC_RAW_ICMP           0x00000100
  88 +#define NXC_RAW_SOCKET         0x00000200
  89 +#define NXC_RAW_SEND           0x00000400
  90
  91
  92  /* address types */
  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-04-20 20:06:33.000000000 -0400
  96 @@ -131,6 +131,9 @@
  97         /* Storage reserved for other modules: */
  98         union nf_conntrack_proto proto;
  99
 100 +       /* PLANETLAB. VNET-specific */
 101 +       xid_t xid[IP_CT_DIR_MAX];
 102 +
 103         /* features dynamically at the end: helper, nat (both optional) */
 104         char data[0];
 105  };
 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-04-20 20:06:33.000000000 -0400
 109 @@ -36,7 +36,7 @@
 110
 111  extern struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
 112                                     __be32 raddr, __be32 laddr,
 113 -                                   int dif);
 114 +                                   int dif, int tag);
 115
 116  extern int raw_v4_input(struct sk_buff *skb, struct iphdr *iph, int hash);
 117
 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-04-20 20:06:33.000000000 -0400
 121 @@ -56,6 +56,7 @@
 122  #include <linux/rtnetlink.h>
 123  #include <linux/init.h>
 124  #include <linux/scatterlist.h>
 125 +#include <linux/vs_network.h>
 126
 127  #include <net/protocol.h>
 128  #include <net/dst.h>
 129 @@ -174,6 +175,7 @@
 130         skb->data = data;
 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);
 137 @@ -443,6 +445,8 @@
 138         C(tail);
 139         C(end);
 140
 141 +       /* Sapan: Cloned skbs aren't owned by anyone. Let the cloner decide who it belongs to. */
 142 +
 143         atomic_inc(&(skb_shinfo(skb)->dataref));
 144         skb->cloned = 1;
 145
 146 @@ -492,6 +496,7 @@
 147         new->tc_index   = old->tc_index;
 148  #endif
 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-04-20 20:06:30.000000000 -0400
 156 +++ linux-2.6.22-520/net/core/sock.c    2008-04-20 20:06:33.000000000 -0400
 157 @@ -444,6 +444,19 @@
 158                 }
 159                 goto set_sndbuf;
 160
 161 +       case SO_SETXID:
 162 +               if (current_vx_info()) {
 163 +                       ret = -EPERM;
 164 +                       break;
 165 +               }
 166 +               if (val < 0 || val > MAX_S_CONTEXT) {
 167 +                       ret = -EINVAL;
 168 +                       break;
 169 +               }
 170 +               sk->sk_xid = val;
 171 +               sk->sk_nid = val;
 172 +               break;
 173 +
 174         case SO_RCVBUF:
 175                 /* Don't error on this BSD doesn't and if you think
 176                    about it this is right. Otherwise apps have to
 177 @@ -573,7 +586,7 @@
 178                 char devname[IFNAMSIZ];
 179
 180                 /* Sorry... */
 181 -               if (!capable(CAP_NET_RAW)) {
 182 +               if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
 183                         ret = -EPERM;
 184                         break;
 185                 }
 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-04-20 20:06:30.000000000 -0400
 188 +++ linux-2.6.22-520/net/ipv4/af_inet.c 2008-04-20 20:06:33.000000000 -0400
 189 @@ -178,6 +178,8 @@
 190                         return -EAGAIN;
 191                 }
 192                 inet->sport = htons(inet->num);
 193 +               sk->sk_xid = vx_current_xid();
 194 +               sk->sk_nid = nx_current_nid();
 195         }
 196         release_sock(sk);
 197         return 0;
 198 @@ -312,6 +314,9 @@
 199         if ((protocol == IPPROTO_ICMP) &&
 200                 nx_capable(answer->capability, NXC_RAW_ICMP))
 201                 goto override;
 202 +       if (sock->type == SOCK_RAW &&
 203 +               nx_capable(answer->capability, NXC_RAW_SOCKET))
 204 +               goto override;
 205         if (answer->capability > 0 && !capable(answer->capability))
 206                 goto out_rcu_unlock;
 207  override:
 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-04-20 20:06:32.000000000 -0400
 210 +++ linux-2.6.22-520/net/ipv4/icmp.c    2008-04-20 20:06:33.000000000 -0400
 211 @@ -709,7 +709,7 @@
 212         if ((raw_sk = sk_head(&raw_v4_htable[hash])) != NULL) {
 213                 while ((raw_sk = __raw_v4_lookup(raw_sk, protocol, iph->daddr,
 214                                                  iph->saddr,
 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-04-20 20:06:33.000000000 -0400
 223 @@ -409,7 +409,7 @@
 224                                         optptr[2] += 8;
 225                                         break;
 226                                       default:
 227 -                                       if (!skb && !capable(CAP_NET_RAW)) {
 228 +                                       if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
 229                                                 pp_ptr = optptr + 3;
 230                                                 goto error;
 231                                         }
 232 @@ -445,7 +445,7 @@
 233                                 opt->router_alert = optptr - iph;
 234                         break;
 235                       case IPOPT_CIPSO:
 236 -                       if ((!skb && !capable(CAP_NET_RAW)) || opt->cipso) {
 237 +                       if ((!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) || opt->cipso) {
 238                                 pp_ptr = optptr;
 239                                 goto error;
 240                         }
 241 @@ -458,7 +458,7 @@
 242                       case IPOPT_SEC:
 243                       case IPOPT_SID:
 244                       default:
 245 -                       if (!skb && !capable(CAP_NET_RAW)) {
 246 +                       if (!skb && !nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET)) {
 247                                 pp_ptr = optptr;
 248                                 goto error;
 249                         }
 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-04-20 20:06:25.000000000 -0400
 252 +++ linux-2.6.22-520/net/ipv4/netfilter/ipt_LOG.c       2008-04-20 20:06:33.000000000 -0400
 253 @@ -49,6 +49,8 @@
 254         else
 255                 logflags = NF_LOG_MASK;
 256
 257 +       printk("TAG=%d ", skb->skb_tag);
 258 +
 259         ih = skb_header_pointer(skb, iphoff, sizeof(_iph), &_iph);
 260         if (ih == NULL) {
 261                 printk("TRUNCATED");
 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-04-20 20:06:30.000000000 -0400
 264 +++ linux-2.6.22-520/net/ipv4/raw.c     2008-04-20 20:06:33.000000000 -0400
 265 @@ -103,7 +103,7 @@
 266
 267  struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num,
 268                              __be32 raddr, __be32 laddr,
 269 -                            int dif)
 270 +                            int dif, int tag)
 271  {
 272         struct hlist_node *node;
 273
 274 @@ -112,6 +112,7 @@
 275
 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 */
 282 @@ -161,7 +162,7 @@
 283                 goto out;
 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);
 288
 289         while (sk) {
 290                 delivered = 1;
 291 @@ -174,7 +175,7 @@
 292                 }
 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);
 297         }
 298  out:
 299         read_unlock(&raw_v4_lock);
 300 @@ -315,7 +316,7 @@
 301         }
 302
 303         err = -EPERM;
 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) &&
 306                 sk->sk_nx_info &&
 307                 !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND))
 308                 goto error_free;
 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-04-20 20:06:33.000000000 -0400
 312 @@ -389,6 +389,13 @@
 313
 314           To compile it as a module, choose M here.  If unsure, say N.
 315
 316 +config NETFILTER_XT_TARGET_SETXID
 317 +       tristate '"SETXID" target support'
 318 +       depends on NETFILTER_XTABLES
 319 +       help
 320 +         This option adds a `SETXID' target, which allows you to alter the
 321 +         xid of a socket.
 322 +
 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-04-20 20:06:33.000000000 -0400
 329 @@ -37,6 +37,7 @@
 330  obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
 331
 332  # targets
 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-04-20 20:06:33.000000000 -0400
 340 @@ -726,6 +726,8 @@
 341
 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;
 346
 347         write_unlock_bh(&nf_conntrack_lock);
 348
 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-04-20 20:09:08.000000000 -0400
 352 @@ -5,13 +5,18 @@
 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.
 356 + *
 357   */
 358
 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>
 366
 367 +#include <net/netfilter/nf_conntrack.h>
 368  #include <linux/netfilter/x_tables.h>
 369  #include <linux/netfilter/xt_MARK.h>
 370
 371 @@ -21,6 +26,48 @@
 372  MODULE_ALIAS("ipt_MARK");
 373  MODULE_ALIAS("ip6t_MARK");
 374
 375 +static inline u_int16_t
 376 +get_dst_port(struct nf_conntrack_tuple *tuple)
 377 +{
 378 +       switch (tuple->dst.protonum) {
 379 +       case IPPROTO_GRE:
 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;
 383 +#else
 384 +               return htons(ntohl(tuple->dst.u.gre.key));
 385 +#endif
 386 +       case IPPROTO_ICMP:
 387 +               /* Bind on ICMP echo ID */
 388 +               return tuple->src.u.icmp.id;
 389 +       case IPPROTO_TCP:
 390 +               return tuple->dst.u.tcp.port;
 391 +       case IPPROTO_UDP:
 392 +               return tuple->dst.u.udp.port;
 393 +       default:
 394 +               return tuple->dst.u.all;
 395 +       }
 396 +}
 397 +
 398 +static inline u_int16_t
 399 +get_src_port(struct nf_conntrack_tuple *tuple)
 400 +{
 401 +       switch (tuple->dst.protonum) {
 402 +       case IPPROTO_GRE:
 403 +               /* XXX Truncate 32-bit GRE key to 16 bits */
 404 +               return htons(ntohl(tuple->src.u.gre.key));
 405 +       case IPPROTO_ICMP:
 406 +               /* Bind on ICMP echo ID */
 407 +               return tuple->src.u.icmp.id;
 408 +       case IPPROTO_TCP:
 409 +               return tuple->src.u.tcp.port;
 410 +       case IPPROTO_UDP:
 411 +               return tuple->src.u.udp.port;
 412 +       default:
 413 +               return tuple->src.u.all;
 414 +       }
 415 +}
 416 +
 417  static unsigned int
 418  target_v0(struct sk_buff **pskb,
 419           const struct net_device *in,
 420 @@ -44,7 +91,7 @@
 421           const void *targinfo)
 422  {
 423         const struct xt_mark_target_info_v1 *markinfo = targinfo;
 424 -       int mark = 0;
 425 +       int mark = -1;
 426
 427         switch (markinfo->mode) {
 428         case XT_MARK_SET:
 429 @@ -58,8 +105,63 @@
 430         case XT_MARK_OR:
 431                 mark = (*pskb)->mark | markinfo->mark;
 432                 break;
 433 +
 434 +               case XT_MARK_COPYXID: {
 435 +                                             enum ip_conntrack_info ctinfo;
 436 +                                             struct sock *connection_sk;
 437 +                                             int dif;
 438 +
 439 +                                             struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
 440 +                                             extern struct inet_hashinfo tcp_hashinfo;
 441 +                                             enum ip_conntrack_dir dir;
 442 +                                             if (!ct)
 443 +                                                     break;
 444 +
 445 +                                             dir = CTINFO2DIR(ctinfo);
 446 +                                             u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
 447 +                                             u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple);
 448 +                                             u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum;
 449 +
 450 +                                             u_int32_t ip;
 451 +                                             u_int16_t port;
 452 +
 453 +                                             dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
 454 +                                             ip = ct->tuplehash[dir].tuple.dst.u3.ip;
 455 +                                             port = get_dst_port(&ct->tuplehash[dir].tuple);
 456 +
 457 +                                             if (proto == 1 || proto == 17) {
 458 +                                                     if (((*pskb)->mark!=-1) && (*pskb)->mark)
 459 +                                                             ct->xid[0]=(*pskb)->mark;
 460 +                                                     if (ct->xid[0])
 461 +                                                             mark = ct->xid[0];
 462 +
 463 +                                             }
 464 +                                             else if (proto == 6) {
 465 +                                                     if ((*pskb)->sk) {
 466 +                                                             connection_sk = (*pskb)->sk;
 467 +                                                             sock_hold(connection_sk);
 468 +                                                     }
 469 +                                                     else
 470 +                                                             connection_sk = inet_lookup_established(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
 471 +
 472 +
 473 +                                                     if (connection_sk) {
 474 +                                                             if (connection_sk->sk_state == TCP_TIME_WAIT) {
 475 +                                                                     inet_twsk_put(inet_twsk(connection_sk));
 476 +                                                                     break;
 477 +                                                             }
 478 +                                                             connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
 479 +                                                             ct->xid[!dir]=connection_sk->sk_xid;
 480 +                                                             if (connection_sk->sk_xid != 0)
 481 +                                                                     mark = connection_sk->sk_xid;
 482 +                                                             sock_put(connection_sk);
 483 +                                                     }
 484 +                                             }
 485 +                                             break;
 486 +                                     }
 487         }
 488
 489 +       if (mark != -1)
 490         (*pskb)->mark = mark;
 491         return XT_CONTINUE;
 492  }
 493 @@ -92,7 +194,8 @@
 494
 495         if (markinfo->mode != XT_MARK_SET
 496             && markinfo->mode != XT_MARK_AND
 497 -           && markinfo->mode != XT_MARK_OR) {
 498 +           && markinfo->mode != XT_MARK_OR
 499 +           && markinfo->mode != XT_MARK_COPYXID) {
 500                 printk(KERN_WARNING "MARK: unknown mode %u\n",
 501                        markinfo->mode);
 502                 return 0;
 503 diff -Nurb linux-2.6.22-510/net/netfilter/xt_SETXID.c linux-2.6.22-520/net/netfilter/xt_SETXID.c
 504 --- linux-2.6.22-510/net/netfilter/xt_SETXID.c  1969-12-31 19:00:00.000000000 -0500
 505 +++ linux-2.6.22-520/net/netfilter/xt_SETXID.c  2008-04-20 20:06:33.000000000 -0400
 506 @@ -0,0 +1,79 @@
 507 +#include <linux/module.h>
 508 +#include <linux/skbuff.h>
 509 +#include <linux/ip.h>
 510 +#include <net/checksum.h>
 511 +#include <linux/vs_network.h>
 512 +
 513 +#include <linux/netfilter/x_tables.h>
 514 +#include <linux/netfilter/xt_SETXID.h>
 515 +
 516 +MODULE_LICENSE("GPL");
 517 +MODULE_AUTHOR("");
 518 +MODULE_DESCRIPTION("");
 519 +MODULE_ALIAS("ipt_SETXID");
 520 +
 521 +static unsigned int
 522 +target_v1(struct sk_buff **pskb,
 523 +         const struct net_device *in,
 524 +         const struct net_device *out,
 525 +         unsigned int hooknum,
 526 +         const struct xt_target *target,
 527 +         const void *targinfo)
 528 +{
 529 +       const struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
 530 +
 531 +       switch (setxidinfo->mode) {
 532 +       case XT_SET_PACKET_XID:
 533 +                (*pskb)->skb_tag = setxidinfo->mark;
 534 +               break;
 535 +       }
 536 +       return XT_CONTINUE;
 537 +}
 538 +
 539 +
 540 +static int
 541 +checkentry_v1(const char *tablename,
 542 +             const void *entry,
 543 +             const struct xt_target *target,
 544 +             void *targinfo,
 545 +             unsigned int hook_mask)
 546 +{
 547 +       struct xt_setxid_target_info_v1 *setxidinfo = targinfo;
 548 +
 549 +       if (setxidinfo->mode != XT_SET_PACKET_XID) {
 550 +               printk(KERN_WARNING "SETXID: unknown mode %u\n",
 551 +                      setxidinfo->mode);
 552 +               return 0;
 553 +       }
 554 +
 555 +       return 1;
 556 +}
 557 +
 558 +static struct xt_target xt_setxid_target[] = {
 559 +       {
 560 +               .name           = "SETXID",
 561 +               .family         = AF_INET,
 562 +               .revision       = 1,
 563 +               .checkentry     = checkentry_v1,
 564 +               .target         = target_v1,
 565 +               .targetsize     = sizeof(struct xt_setxid_target_info_v1),
 566 +               .table          = "mangle",
 567 +               .me             = THIS_MODULE,
 568 +       }
 569 +};
 570 +
 571 +static int __init init(void)
 572 +{
 573 +       int err;
 574 +
 575 +       err = xt_register_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
 576 +       return err;
 577 +}
 578 +
 579 +static void __exit fini(void)
 580 +{
 581 +       xt_unregister_targets(xt_setxid_target, ARRAY_SIZE(xt_setxid_target));
 582 +}
 583 +
 584 +module_init(init);
 585 +module_exit(fini);
 586 diff -Nurb linux-2.6.22-510/net/packet/af_packet.c linux-2.6.22-520/net/packet/af_packet.c
 587 --- linux-2.6.22-510/net/packet/af_packet.c     2007-07-08 19:32:17.000000000 -0400
 588 +++ linux-2.6.22-520/net/packet/af_packet.c     2008-04-20 20:06:33.000000000 -0400
 589 @@ -78,6 +78,7 @@
 590  #include <linux/poll.h>
 591  #include <linux/module.h>
 592  #include <linux/init.h>
 593 +#include <linux/vs_network.h>
 594
 595  #ifdef CONFIG_INET
 596  #include <net/inet_common.h>
 597 @@ -324,6 +325,9 @@
 598         __be16 proto=0;
 599         int err;
 600
 601 +       if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
 602 +               return -EPERM;
 603 +
 604         /*
 605          *      Get and verify the address.
 606          */
 607 @@ -420,6 +424,10 @@
 608                                       unsigned int res)
 609  {
 610         struct sk_filter *filter;
 611 +       int tag = skb->skb_tag;
 612 +
 613 +       if (sk->sk_nx_info && !(tag == 1 || sk->sk_nid == tag))
 614 +               return 0;
 615
 616         rcu_read_lock_bh();
 617         filter = rcu_dereference(sk->sk_filter);
 618 @@ -711,6 +719,9 @@
 619         unsigned char *addr;
 620         int ifindex, err, reserve = 0;
 621
 622 +       if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
 623 +               return -EPERM;
 624 +
 625         /*
 626          *      Get and verify the address.
 627          */
 628 @@ -984,7 +995,7 @@
 629         __be16 proto = (__force __be16)protocol; /* weird, but documented */
 630         int err;
 631
 632 -       if (!capable(CAP_NET_RAW))
 633 +       if (!nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))
 634                 return -EPERM;
 635         if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW &&
 636             sock->type != SOCK_PACKET)
 637 diff -Nurb linux-2.6.22-510/xt_MARK.c linux-2.6.22-520/xt_MARK.c
 638 --- linux-2.6.22-510/xt_MARK.c  1969-12-31 19:00:00.000000000 -0500
 639 +++ linux-2.6.22-520/xt_MARK.c  2008-04-20 20:06:33.000000000 -0400
 640 @@ -0,0 +1,287 @@
 641 +/* This is a module which is used for setting the NFMARK field of an skb. */
 642 +
 643 +/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
 644 + *
 645 + * This program is free software; you can redistribute it and/or modify
 646 + * it under the terms of the GNU General Public License version 2 as
 647 + * published by the Free Software Foundation.
 648 + *
 649 + */
 650 +
 651 +#include <linux/module.h>
 652 +#include <linux/version.h>
 653 +#include <linux/skbuff.h>
 654 +#include <linux/ip.h>
 655 +#include <net/checksum.h>
 656 +#include <net/route.h>
 657 +#include <net/inet_hashtables.h>
 658 +
 659 +#include <net/netfilter/nf_conntrack.h>
 660 +#include <linux/netfilter/x_tables.h>
 661 +#include <linux/netfilter/xt_MARK.h>
 662 +
 663 +MODULE_LICENSE("GPL");
 664 +MODULE_AUTHOR("Marc Boucher <marc@mbsi.ca>");
 665 +MODULE_DESCRIPTION("ip[6]tables MARK modification module");
 666 +MODULE_ALIAS("ipt_MARK");
 667 +MODULE_ALIAS("ip6t_MARK");
 668 +
 669 +static inline u_int16_t
 670 +get_dst_port(struct nf_conntrack_tuple *tuple)
 671 +{
 672 +       switch (tuple->dst.protonum) {
 673 +       case IPPROTO_GRE:
 674 +               /* XXX Truncate 32-bit GRE key to 16 bits */
 675 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
 676 +               return tuple->dst.u.gre.key;
 677 +#else
 678 +               return htons(ntohl(tuple->dst.u.gre.key));
 679 +#endif
 680 +       case IPPROTO_ICMP:
 681 +               /* Bind on ICMP echo ID */
 682 +               return tuple->src.u.icmp.id;
 683 +       case IPPROTO_TCP:
 684 +               return tuple->dst.u.tcp.port;
 685 +       case IPPROTO_UDP:
 686 +               return tuple->dst.u.udp.port;
 687 +       default:
 688 +               return tuple->dst.u.all;
 689 +       }
 690 +}
 691 +
 692 +static inline u_int16_t
 693 +get_src_port(struct nf_conntrack_tuple *tuple)
 694 +{
 695 +       switch (tuple->dst.protonum) {
 696 +       case IPPROTO_GRE:
 697 +               /* XXX Truncate 32-bit GRE key to 16 bits */
 698 +               return htons(ntohl(tuple->src.u.gre.key));
 699 +       case IPPROTO_ICMP:
 700 +               /* Bind on ICMP echo ID */
 701 +               return tuple->src.u.icmp.id;
 702 +       case IPPROTO_TCP:
 703 +               return tuple->src.u.tcp.port;
 704 +       case IPPROTO_UDP:
 705 +               return tuple->src.u.udp.port;
 706 +       default:
 707 +               return tuple->src.u.all;
 708 +       }
 709 +}
 710 +
 711 +static unsigned int
 712 +target_v0(struct sk_buff **pskb,
 713 +         const struct net_device *in,
 714 +         const struct net_device *out,
 715 +         unsigned int hooknum,
 716 +         const struct xt_target *target,
 717 +         const void *targinfo)
 718 +{
 719 +       const struct xt_mark_target_info *markinfo = targinfo;
 720 +
 721 +       (*pskb)->mark = markinfo->mark;
 722 +       return XT_CONTINUE;
 723 +}
 724 +
 725 +static unsigned int
 726 +target_v1(struct sk_buff **pskb,
 727 +         const struct net_device *in,
 728 +         const struct net_device *out,
 729 +         unsigned int hooknum,
 730 +         const struct xt_target *target,
 731 +         const void *targinfo)
 732 +{
 733 +       const struct xt_mark_target_info_v1 *markinfo = targinfo;
 734 +       int mark = -1;
 735 +
 736 +       switch (markinfo->mode) {
 737 +               case XT_MARK_SET:
 738 +                       mark = markinfo->mark;
 739 +                       break;
 740 +
 741 +               case XT_MARK_AND:
 742 +                       mark = (*pskb)->mark & markinfo->mark;
 743 +                       break;
 744 +
 745 +               case XT_MARK_OR:
 746 +                       mark = (*pskb)->mark | markinfo->mark;
 747 +                       break;
 748 +
 749 +               case XT_MARK_COPYXID: {
 750 +                                             enum ip_conntrack_info ctinfo;
 751 +                                             struct sock *connection_sk;
 752 +                                             int dif;
 753 +
 754 +                                             struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);
 755 +                                             extern struct inet_hashinfo tcp_hashinfo;
 756 +                                             enum ip_conntrack_dir dir;
 757 +                                             if (!ct)
 758 +                                                     break;
 759 +
 760 +                                             dir = CTINFO2DIR(ctinfo);
 761 +                                             u_int32_t src_ip = ct->tuplehash[dir].tuple.src.u3.ip;
 762 +                                             u_int16_t src_port = get_src_port(&ct->tuplehash[dir].tuple);
 763 +                                             u_int16_t proto = ct->tuplehash[dir].tuple.dst.protonum;
 764 +
 765 +                                             u_int32_t ip;
 766 +                                             u_int16_t port;
 767 +
 768 +                                             dif = ((struct rtable *)(*pskb)->dst)->rt_iif;
 769 +                                             ip = ct->tuplehash[dir].tuple.dst.u3.ip;
 770 +                                             port = get_dst_port(&ct->tuplehash[dir].tuple);
 771 +
 772 +                                             if (proto == 1 || proto == 17) {
 773 +                                                     if (((*pskb)->mark!=-1) && (*pskb)->mark)
 774 +                                                             ct->xid[0]=(*pskb)->mark;
 775 +                                                     if (ct->xid[0])
 776 +                                                             mark = ct->xid[0];
 777 +
 778 +                                             }
 779 +                                             else if (proto == 6) {
 780 +                                                     if ((*pskb)->sk) {
 781 +                                                             connection_sk = (*pskb)->sk;
 782 +                                                             sock_hold(connection_sk);
 783 +                                                     }
 784 +                                                     else {
 785 +                                                             connection_sk = inet_lookup(&tcp_hashinfo, src_ip, src_port, ip, port, dif);
 786 +                                                     }
 787 +
 788 +                                                     if (connection_sk) {
 789 +                                                             connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
 790 +                                                             ct->xid[!dir]=connection_sk->sk_xid;
 791 +                                                             if (connection_sk->sk_xid != 0)
 792 +                                                                     mark = connection_sk->sk_xid;
 793 +                                                             if (connection_sk->sk_state == TCP_TIME_WAIT)
 794 +                                                                     inet_twsk_put(inet_twsk(connection_sk));
 795 +                                                             else
 796 +                                                                     sock_put(connection_sk);
 797 +                                                     }
 798 +                                             }
 799 +                                             break;
 800 +                                     }
 801 +       }
 802 +
 803 +       if (mark != -1)
 804 +       (*pskb)->mark = mark;
 805 +       return XT_CONTINUE;
 806 +}
 807 +
 808 +
 809 +static int
 810 +checkentry_v0(const char *tablename,
 811 +             const void *entry,
 812 +             const struct xt_target *target,
 813 +             void *targinfo,
 814 +             unsigned int hook_mask)
 815 +{
 816 +       struct xt_mark_target_info *markinfo = targinfo;
 817 +
 818 +       if (markinfo->mark > 0xffffffff) {
 819 +               printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
 820 +               return 0;
 821 +       }
 822 +       return 1;
 823 +}
 824 +
 825 +static int
 826 +checkentry_v1(const char *tablename,
 827 +             const void *entry,
 828 +             const struct xt_target *target,
 829 +             void *targinfo,
 830 +             unsigned int hook_mask)
 831 +{
 832 +       struct xt_mark_target_info_v1 *markinfo = targinfo;
 833 +
 834 +       if (markinfo->mode != XT_MARK_SET
 835 +           && markinfo->mode != XT_MARK_AND
 836 +           && markinfo->mode != XT_MARK_OR
 837 +           && markinfo->mode != XT_MARK_COPYXID) {
 838 +               printk(KERN_WARNING "MARK: unknown mode %u\n",
 839 +                      markinfo->mode);
 840 +               return 0;
 841 +       }
 842 +       if (markinfo->mark > 0xffffffff) {
 843 +               printk(KERN_WARNING "MARK: Only supports 32bit wide mark\n");
 844 +               return 0;
 845 +       }
 846 +       return 1;
 847 +}
 848 +
 849 +#ifdef CONFIG_COMPAT
 850 +struct compat_xt_mark_target_info_v1 {
 851 +       compat_ulong_t  mark;
 852 +       u_int8_t        mode;
 853 +       u_int8_t        __pad1;
 854 +       u_int16_t       __pad2;
 855 +};
 856 +
 857 +static void compat_from_user_v1(void *dst, void *src)
 858 +{
 859 +       struct compat_xt_mark_target_info_v1 *cm = src;
 860 +       struct xt_mark_target_info_v1 m = {
 861 +               .mark   = cm->mark,
 862 +               .mode   = cm->mode,
 863 +       };
 864 +       memcpy(dst, &m, sizeof(m));
 865 +}
 866 +
 867 +static int compat_to_user_v1(void __user *dst, void *src)
 868 +{
 869 +       struct xt_mark_target_info_v1 *m = src;
 870 +       struct compat_xt_mark_target_info_v1 cm = {
 871 +               .mark   = m->mark,
 872 +               .mode   = m->mode,
 873 +       };
 874 +       return copy_to_user(dst, &cm, sizeof(cm)) ? -EFAULT : 0;
 875 +}
 876 +#endif /* CONFIG_COMPAT */
 877 +
 878 +static struct xt_target xt_mark_target[] = {
 879 +       {
 880 +               .name           = "MARK",
 881 +               .family         = AF_INET,
 882 +               .revision       = 0,
 883 +               .checkentry     = checkentry_v0,
 884 +               .target         = target_v0,
 885 +               .targetsize     = sizeof(struct xt_mark_target_info),
 886 +               .table          = "mangle",
 887 +               .me             = THIS_MODULE,
 888 +       },
 889 +       {
 890 +               .name           = "MARK",
 891 +               .family         = AF_INET,
 892 +               .revision       = 1,
 893 +               .checkentry     = checkentry_v1,
 894 +               .target         = target_v1,
 895 +               .targetsize     = sizeof(struct xt_mark_target_info_v1),
 896 +#ifdef CONFIG_COMPAT
 897 +               .compatsize     = sizeof(struct compat_xt_mark_target_info_v1),
 898 +               .compat_from_user = compat_from_user_v1,
 899 +               .compat_to_user = compat_to_user_v1,
 900 +#endif
 901 +               .table          = "mangle",
 902 +               .me             = THIS_MODULE,
 903 +       },
 904 +       {
 905 +               .name           = "MARK",
 906 +               .family         = AF_INET6,
 907 +               .revision       = 0,
 908 +               .checkentry     = checkentry_v0,
 909 +               .target         = target_v0,
 910 +               .targetsize     = sizeof(struct xt_mark_target_info),
 911 +               .table          = "mangle",
 912 +               .me             = THIS_MODULE,
 913 +       },
 914 +};
 915 +
 916 +static int __init xt_mark_init(void)
 917 +{
 918 +       return xt_register_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
 919 +}
 920 +
 921 +static void __exit xt_mark_fini(void)
 922 +{
 923 +       xt_unregister_targets(xt_mark_target, ARRAY_SIZE(xt_mark_target));
 924 +}
 925 +
 926 +module_init(xt_mark_init);
 927 +module_exit(xt_mark_fini);