SOURCES (LINUX_2_6): kernel-owner-xid.patch - rewriten for xt_owner in 2.6.25
zbyniu
zbyniu at pld-linux.org
Tue May 20 22:07:20 CEST 2008
Author: zbyniu Date: Tue May 20 20:07:20 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- rewriten for xt_owner in 2.6.25
---- Files affected:
SOURCES:
kernel-owner-xid.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/kernel-owner-xid.patch
diff -u SOURCES/kernel-owner-xid.patch:1.1.2.2 SOURCES/kernel-owner-xid.patch:1.1.2.3
--- SOURCES/kernel-owner-xid.patch:1.1.2.2 Tue Oct 9 15:16:17 2007
+++ SOURCES/kernel-owner-xid.patch Tue May 20 22:07:14 2008
@@ -1,6 +1,27 @@
-diff -Nurp linux-2.6.17.11-vs2.1.1-rc31/include/linux/netfilter_ipv4/ipt_owner.h linux-2.6.17.11-vs2.1.1-rc31.owner-xid/include/linux/netfilter_ipv4/ipt_owner.h
---- linux-2.6.17.11-vs2.1.1-rc31/include/linux/netfilter_ipv4/ipt_owner.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/include/linux/netfilter_ipv4/ipt_owner.h 2006-09-05 19:43:48.000000000 +0200
+diff -upr linux-2.6.25/include/linux/netfilter/xt_owner.h linux-2.6.25-owner-xid/include/linux/netfilter/xt_owner.h
+--- linux-2.6.25/include/linux/netfilter/xt_owner.h 2008-04-17 02:49:44.000000000 +0000
++++ linux-2.6.25-owner-xid/include/linux/netfilter/xt_owner.h 2008-05-20 18:36:38.074950561 +0000
+@@ -5,12 +5,16 @@ enum {
+ XT_OWNER_UID = 1 << 0,
+ XT_OWNER_GID = 1 << 1,
+ XT_OWNER_SOCKET = 1 << 2,
++ XT_OWNER_XID = 1 << 3,
++ XT_OWNER_NID = 1 << 4,
+ };
+
+ struct xt_owner_match_info {
+ u_int32_t uid_min, uid_max;
+ u_int32_t gid_min, gid_max;
+ u_int8_t match, invert;
++ u_int32_t nid;
++ u_int32_t xid;
+ };
+
+ #endif /* _XT_OWNER_MATCH_H */
+Only in linux-2.6.25-owner-xid/include/linux/netfilter: xt_owner.h~
+diff -upr linux-2.6.25/include/linux/netfilter_ipv4/ipt_owner.h linux-2.6.25-owner-xid/include/linux/netfilter_ipv4/ipt_owner.h
+--- linux-2.6.25/include/linux/netfilter_ipv4/ipt_owner.h 2008-05-20 17:15:02.411418369 +0000
++++ linux-2.6.25-owner-xid/include/linux/netfilter_ipv4/ipt_owner.h 2008-05-20 17:16:22.905886167 +0000
@@ -1,12 +1,16 @@
#ifndef _IPT_OWNER_H
#define _IPT_OWNER_H
@@ -27,9 +48,9 @@
};
#endif /*_IPT_OWNER_H*/
-diff -Nurp linux-2.6.17.11-vs2.1.1-rc31/include/linux/netfilter_ipv6/ip6t_owner.h linux-2.6.17.11-vs2.1.1-rc31.owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h
---- linux-2.6.17.11-vs2.1.1-rc31/include/linux/netfilter_ipv6/ip6t_owner.h 2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h 2006-09-05 19:45:51.000000000 +0200
+diff -upr linux-2.6.25/include/linux/netfilter_ipv6/ip6t_owner.h linux-2.6.25-owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h
+--- linux-2.6.25/include/linux/netfilter_ipv6/ip6t_owner.h 2008-05-20 17:15:02.411418369 +0000
++++ linux-2.6.25-owner-xid/include/linux/netfilter_ipv6/ip6t_owner.h 2008-05-20 17:16:22.905886167 +0000
@@ -1,11 +1,15 @@
#ifndef _IP6T_OWNER_H
#define _IP6T_OWNER_H
@@ -55,47 +76,58 @@
};
#endif /*_IPT_OWNER_H*/
-diff -Nurp linux-2.6.17.11-vs2.1.1-rc31/net/ipv4/netfilter/ipt_owner.c linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv4/netfilter/ipt_owner.c
---- linux-2.6.17.11-vs2.1.1-rc31/net/ipv4/netfilter/ipt_owner.c 2006-06-18 15:25:05.000000000 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv4/netfilter/ipt_owner.c 2006-09-05 19:44:43.000000000 +0200
-@@ -48,6 +48,18 @@ match(const struct sk_buff *skb,
+diff -upr linux-2.6.25/net/netfilter/xt_owner.c linux-2.6.25-owner-xid/net/netfilter/xt_owner.c
+--- linux-2.6.25/net/netfilter/xt_owner.c 2008-05-20 17:15:02.411418369 +0000
++++ linux-2.6.25-owner-xid/net/netfilter/xt_owner.c 2008-05-20 17:48:15.774419069 +0000
+@@ -46,6 +46,16 @@ owner_mt_v0(const struct sk_buff *skb, c
+ !!(info->invert & IPT_OWNER_GID))
return false;
- }
-+ if(info->match & IPT_OWNER_NID) {
++ if (info->match & IPT_OWNER_NID)
+ if ((skb->sk->sk_nid != info->nid) ^
+ !!(info->invert & IPT_OWNER_NID))
+ return 0;
-+ }
+
-+ if(info->match & IPT_OWNER_XID) {
++ if (info->match & IPT_OWNER_XID)
+ if ((skb->sk->sk_xid != info->xid) ^
+ !!(info->invert & IPT_OWNER_XID))
+ return 0;
-+ }
+
return true;
}
-diff -Nurp linux-2.6.17.11-vs2.1.1-rc31/net/ipv6/netfilter/ip6t_owner.c linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv6/netfilter/ip6t_owner.c
---- linux-2.6.17.11-vs2.1.1-rc31/net/ipv6/netfilter/ip6t_owner.c 2006-06-18 15:25:05.000000000 +0200
-+++ linux-2.6.17.11-vs2.1.1-rc31.owner-xid/net/ipv6/netfilter/ip6t_owner.c 2006-09-05 19:46:57.000000000 +0200
-@@ -49,6 +49,18 @@ match(const struct sk_buff *skb,
+@@ -75,6 +85,16 @@ owner_mt6_v0(const struct sk_buff *skb,
+ !!(info->invert & IP6T_OWNER_GID))
return false;
- }
-+ if (info->match & IP6T_OWNER_NID) {
++ if (info->match & IP6T_OWNER_NID)
+ if ((skb->sk->sk_nid != info->nid) ^
+ !!(info->invert & IP6T_OWNER_NID))
+ return 0;
-+ }
+
-+ if (info->match & IP6T_OWNER_XID) {
++ if (info->match & IP6T_OWNER_XID)
+ if ((skb->sk->sk_xid != info->xid) ^
+ !!(info->invert & IP6T_OWNER_XID))
+ return 0;
-+ }
+
return true;
}
+@@ -113,6 +133,16 @@ owner_mt(const struct sk_buff *skb, cons
+ !(info->invert & XT_OWNER_GID))
+ return false;
+
++ if (info->match & XT_OWNER_NID)
++ if ((skb->sk->sk_nid != info->nid) ^
++ !!(info->invert & XT_OWNER_NID))
++ return 0;
++
++ if (info->match & XT_OWNER_XID)
++ if ((skb->sk->sk_xid != info->xid) ^
++ !!(info->invert & XT_OWNER_XID))
++ return 0;
++
+ return true;
+ }
+
+Only in linux-2.6.25-owner-xid/net/netfilter: xt_owner.c~
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-owner-xid.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list