Author: cieciwa Date: Thu Sep 15 08:33:18 2005 GMT Module: SOURCES Tag: LINUX_2_6 ---- Log message: - [extra] policy - kernel and iptables patch.
---- Files affected: SOURCES: linux-2.6-nf-policy.patch (NONE -> 1.1.2.1) (NEW), iptables-nf-policy.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/linux-2.6-nf-policy.patch diff -u /dev/null SOURCES/linux-2.6-nf-policy.patch:1.1.2.1 --- /dev/null Thu Sep 15 10:33:18 2005 +++ SOURCES/linux-2.6-nf-policy.patch Thu Sep 15 10:33:13 2005 @@ -0,0 +1,560 @@ + include/linux/netfilter_ipv4/ipt_policy.h | 52 +++++++ + include/linux/netfilter_ipv6/ip6t_policy.h | 52 +++++++ + net/ipv4/netfilter/Kconfig | 10 + + net/ipv4/netfilter/Makefile | 1 + net/ipv4/netfilter/ipt_policy.c | 176 +++++++++++++++++++++++++ + net/ipv6/netfilter/Kconfig | 10 + + net/ipv6/netfilter/Makefile | 1 + net/ipv6/netfilter/ip6t_policy.c | 200 +++++++++++++++++++++++++++++ + 8 files changed, 502 insertions(+) + +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_policy.h linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_policy.h +--- linux-2.6.13.1.org/include/linux/netfilter_ipv4/ipt_policy.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.13.1/include/linux/netfilter_ipv4/ipt_policy.h 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,52 @@ ++#ifndef _IPT_POLICY_H ++#define _IPT_POLICY_H ++ ++#define POLICY_MAX_ELEM 4 ++ ++enum ipt_policy_flags ++{ ++ POLICY_MATCH_IN = 0x1, ++ POLICY_MATCH_OUT = 0x2, ++ POLICY_MATCH_NONE = 0x4, ++ POLICY_MATCH_STRICT = 0x8, ++}; ++ ++enum ipt_policy_modes ++{ ++ POLICY_MODE_TRANSPORT, ++ POLICY_MODE_TUNNEL ++}; ++ ++struct ipt_policy_spec ++{ ++ u_int8_t saddr:1, ++ daddr:1, ++ proto:1, ++ mode:1, ++ spi:1, ++ reqid:1; ++}; ++ ++struct ipt_policy_elem ++{ ++ u_int32_t saddr; ++ u_int32_t smask; ++ u_int32_t daddr; ++ u_int32_t dmask; ++ u_int32_t spi; ++ u_int32_t reqid; ++ u_int8_t proto; ++ u_int8_t mode; ++ ++ struct ipt_policy_spec match; ++ struct ipt_policy_spec invert; ++}; ++ ++struct ipt_policy_info ++{ ++ struct ipt_policy_elem pol[POLICY_MAX_ELEM]; ++ u_int16_t flags; ++ u_int16_t len; ++}; ++ ++#endif /* _IPT_POLICY_H */ +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/include/linux/netfilter_ipv6/ip6t_policy.h linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_policy.h +--- linux-2.6.13.1.org/include/linux/netfilter_ipv6/ip6t_policy.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.13.1/include/linux/netfilter_ipv6/ip6t_policy.h 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,52 @@ ++#ifndef _IP6T_POLICY_H ++#define _IP6T_POLICY_H ++ ++#define POLICY_MAX_ELEM 4 ++ ++enum ip6t_policy_flags ++{ ++ POLICY_MATCH_IN = 0x1, ++ POLICY_MATCH_OUT = 0x2, ++ POLICY_MATCH_NONE = 0x4, ++ POLICY_MATCH_STRICT = 0x8, ++}; ++ ++enum ip6t_policy_modes ++{ ++ POLICY_MODE_TRANSPORT, ++ POLICY_MODE_TUNNEL ++}; ++ ++struct ip6t_policy_spec ++{ ++ u_int8_t saddr:1, ++ daddr:1, ++ proto:1, ++ mode:1, ++ spi:1, ++ reqid:1; ++}; ++ ++struct ip6t_policy_elem ++{ ++ struct in6_addr saddr; ++ struct in6_addr smask; ++ struct in6_addr daddr; ++ struct in6_addr dmask; ++ u_int32_t spi; ++ u_int32_t reqid; ++ u_int8_t proto; ++ u_int8_t mode; ++ ++ struct ip6t_policy_spec match; ++ struct ip6t_policy_spec invert; ++}; ++ ++struct ip6t_policy_info ++{ ++ struct ip6t_policy_elem pol[POLICY_MAX_ELEM]; ++ u_int16_t flags; ++ u_int16_t len; ++}; ++ ++#endif /* _IP6T_POLICY_H */ +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig linux-2.6.13.1/net/ipv4/netfilter/Kconfig +--- linux-2.6.13.1.org/net/ipv4/netfilter/Kconfig 2005-09-10 04:42:58.000000000 +0200 ++++ linux-2.6.13.1/net/ipv4/netfilter/Kconfig 2005-09-15 10:23:16.000000000 +0200 +@@ -692,5 +692,15 @@ + Allows altering the ARP packet payload: source and destination + hardware and network addresses. + ++config IP_NF_MATCH_POLICY ++ tristate "IPsec policy match support" ++ depends on IP_NF_IPTABLES && XFRM ++ help ++ Policy matching allows you to match packets based on the ++ IPsec policy that was used during decapsulation/will ++ be used during encapsulation. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ + endmenu + +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/Makefile linux-2.6.13.1/net/ipv4/netfilter/Makefile +--- linux-2.6.13.1.org/net/ipv4/netfilter/Makefile 2005-09-10 04:42:58.000000000 +0200 ++++ linux-2.6.13.1/net/ipv4/netfilter/Makefile 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +0,1 @@ ++obj-$(CONFIG_IP_NF_MATCH_POLICY) += ipt_policy.o +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv4/netfilter/ipt_policy.c linux-2.6.13.1/net/ipv4/netfilter/ipt_policy.c +--- linux-2.6.13.1.org/net/ipv4/netfilter/ipt_policy.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.13.1/net/ipv4/netfilter/ipt_policy.c 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,176 @@ ++/* IP tables module for matching IPsec policy ++ * ++ * Copyright (c) 2004 Patrick McHardy, <[EMAIL PROTECTED]> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/init.h> ++#include <net/xfrm.h> ++ ++#include <linux/netfilter_ipv4.h> ++#include <linux/netfilter_ipv4/ipt_policy.h> ++#include <linux/netfilter_ipv4/ip_tables.h> ++ ++MODULE_AUTHOR("Patrick McHardy <[EMAIL PROTECTED]>"); ++MODULE_DESCRIPTION("IPtables IPsec policy matching module"); ++MODULE_LICENSE("GPL"); ++ ++ ++static inline int ++match_xfrm_state(struct xfrm_state *x, const struct ipt_policy_elem *e) ++{ ++#define MISMATCH(x,y) (e->match.x && ((e->x != (y)) ^ e->invert.x)) ++ ++ if (MISMATCH(saddr, x->props.saddr.a4 & e->smask) || ++ MISMATCH(daddr, x->id.daddr.a4 & e->dmask) || ++ MISMATCH(proto, x->id.proto) || ++ MISMATCH(mode, x->props.mode) || ++ MISMATCH(spi, x->id.spi) || ++ MISMATCH(reqid, x->props.reqid)) ++ return 0; ++ return 1; ++} ++ ++static int ++match_policy_in(const struct sk_buff *skb, const struct ipt_policy_info *info) ++{ ++ const struct ipt_policy_elem *e; ++ struct sec_path *sp = skb->sp; ++ int strict = info->flags & POLICY_MATCH_STRICT; ++ int i, pos; ++ ++ if (sp == NULL) ++ return -1; ++ if (strict && info->len != sp->len) ++ return 0; ++ ++ for (i = sp->len - 1; i >= 0; i--) { ++ pos = strict ? i - sp->len + 1 : 0; ++ if (pos >= info->len) ++ return 0; ++ e = &info->pol[pos]; ++ ++ if (match_xfrm_state(sp->x[i].xvec, e)) { ++ if (!strict) ++ return 1; ++ } else if (strict) ++ return 0; ++ } ++ ++ return strict ? 1 : 0; ++} ++ ++static int ++match_policy_out(const struct sk_buff *skb, const struct ipt_policy_info *info) ++{ ++ const struct ipt_policy_elem *e; ++ struct dst_entry *dst = skb->dst; ++ int strict = info->flags & POLICY_MATCH_STRICT; ++ int i, pos; ++ ++ if (dst->xfrm == NULL) ++ return -1; ++ ++ for (i = 0; dst && dst->xfrm; dst = dst->child, i++) { ++ pos = strict ? i : 0; ++ if (pos >= info->len) ++ return 0; ++ e = &info->pol[pos]; ++ ++ if (match_xfrm_state(dst->xfrm, e)) { ++ if (!strict) ++ return 1; ++ } else if (strict) ++ return 0; ++ } ++ ++ return strict ? 1 : 0; ++} ++ ++static int match(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *matchinfo, int offset, int *hotdrop) ++{ ++ const struct ipt_policy_info *info = matchinfo; ++ int ret; ++ ++ if (info->flags & POLICY_MATCH_IN) ++ ret = match_policy_in(skb, info); ++ else ++ ret = match_policy_out(skb, info); ++ ++ if (ret < 0) { ++ if (info->flags & POLICY_MATCH_NONE) ++ ret = 1; ++ else ++ ret = 0; ++ } else if (info->flags & POLICY_MATCH_NONE) ++ ret = 0; ++ ++ return ret; ++} ++ ++static int checkentry(const char *tablename, const struct ipt_ip *ip, ++ void *matchinfo, unsigned int matchsize, ++ unsigned int hook_mask) ++{ ++ struct ipt_policy_info *info = matchinfo; ++ ++ if (matchsize != IPT_ALIGN(sizeof(*info))) { ++ printk(KERN_ERR "ipt_policy: matchsize %u != %zu\n", ++ matchsize, IPT_ALIGN(sizeof(*info))); ++ return 0; ++ } ++ if (!(info->flags & (POLICY_MATCH_IN|POLICY_MATCH_OUT))) { ++ printk(KERN_ERR "ipt_policy: neither incoming nor " ++ "outgoing policy selected\n"); ++ return 0; ++ } ++ if (hook_mask & (1 << NF_IP_PRE_ROUTING | 1 << NF_IP_LOCAL_IN) ++ && info->flags & POLICY_MATCH_OUT) { ++ printk(KERN_ERR "ipt_policy: output policy not valid in " ++ "PRE_ROUTING and INPUT\n"); ++ return 0; ++ } ++ if (hook_mask & (1 << NF_IP_POST_ROUTING | 1 << NF_IP_LOCAL_OUT) ++ && info->flags & POLICY_MATCH_IN) { ++ printk(KERN_ERR "ipt_policy: input policy not valid in " ++ "POST_ROUTING and OUTPUT\n"); ++ return 0; ++ } ++ if (info->len > POLICY_MAX_ELEM) { ++ printk(KERN_ERR "ipt_policy: too many policy elements\n"); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static struct ipt_match policy_match = ++{ ++ .name = "policy", ++ .match = match, ++ .checkentry = checkentry, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ipt_register_match(&policy_match); ++} ++ ++static void __exit fini(void) ++{ ++ ipt_unregister_match(&policy_match); ++} ++ ++module_init(init); ++module_exit(fini); +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/Kconfig linux-2.6.13.1/net/ipv6/netfilter/Kconfig +--- linux-2.6.13.1.org/net/ipv6/netfilter/Kconfig 2005-09-10 04:42:58.000000000 +0200 ++++ linux-2.6.13.1/net/ipv6/netfilter/Kconfig 2005-09-15 10:23:16.000000000 +0200 +@@ -238,5 +238,15 @@ + If you want to compile it as a module, say M here and read + <file:Documentation/modules.txt>. If unsure, say `N'. + ++config IP6_NF_MATCH_POLICY ++ tristate "IPsec policy match support" ++ depends on IP6_NF_IPTABLES && XFRM ++ help ++ Policy matching allows you to match packets based on the ++ IPsec policy that was used during decapsulation/will ++ be used during encapsulation. ++ ++ To compile it as a module, choose M here. If unsure, say N. ++ + endmenu + +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/Makefile linux-2.6.13.1/net/ipv6/netfilter/Makefile +--- linux-2.6.13.1.org/net/ipv6/netfilter/Makefile 2005-09-10 04:42:58.000000000 +0200 ++++ linux-2.6.13.1/net/ipv6/netfilter/Makefile 2005-09-15 10:23:16.000000000 +0200 +@@ -13,6 +13,7 @@ + obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o + obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o + obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o ++obj-$(CONFIG_IP6_NF_MATCH_POLICY) += ip6t_policy.o + obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o + obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o + obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o +diff -Nur --exclude '*.orig' linux-2.6.13.1.org/net/ipv6/netfilter/ip6t_policy.c linux-2.6.13.1/net/ipv6/netfilter/ip6t_policy.c +--- linux-2.6.13.1.org/net/ipv6/netfilter/ip6t_policy.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.13.1/net/ipv6/netfilter/ip6t_policy.c 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,200 @@ ++/* IP tables module for matching IPsec policy ++ * ++ * Copyright (c) 2004 Patrick McHardy, <[EMAIL PROTECTED]> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/init.h> ++#include <net/xfrm.h> ++ ++#include <linux/netfilter_ipv6.h> ++#include <linux/netfilter_ipv6/ip6t_policy.h> ++#include <linux/netfilter_ipv6/ip6_tables.h> ++ ++MODULE_AUTHOR("Patrick McHardy <[EMAIL PROTECTED]>"); ++MODULE_DESCRIPTION("IPtables IPsec policy matching module"); ++MODULE_LICENSE("GPL"); ++ ++ ++static inline int ip6_masked_addrcmp(struct in6_addr addr1, ++ struct in6_addr mask, ++ struct in6_addr addr2) ++{ ++ int i; ++ ++ for (i = 0; i < 16; i++) { ++ if ((addr1.s6_addr[i] & mask.s6_addr[i]) != ++ (addr2.s6_addr[i] & mask.s6_addr[i])) ++ return 1; ++ } ++ return 0; ++} ++ ++ ++static inline int ++match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e) ++{ ++#define MISMATCH(x,y) (e->match.x && ((e->x != (y)) ^ e->invert.x)) ++ ++ struct in6_addr xfrm_saddr, xfrm_daddr; ++ ++ if ((e->match.saddr ++ && (ip6_masked_addrcmp(xfrm_saddr, e->saddr, e->smask)) ++ ^ e->invert.saddr ) || ++ (e->match.daddr ++ && (ip6_masked_addrcmp(xfrm_daddr, e->daddr, e->dmask)) ++ ^ e->invert.daddr ) || ++ MISMATCH(proto, x->id.proto) || ++ MISMATCH(mode, x->props.mode) || ++ MISMATCH(spi, x->id.spi) || ++ MISMATCH(reqid, x->props.reqid)) ++ return 0; ++ return 1; ++} ++ ++static int ++match_policy_in(const struct sk_buff *skb, const struct ip6t_policy_info *info) ++{ ++ const struct ip6t_policy_elem *e; ++ struct sec_path *sp = skb->sp; ++ int strict = info->flags & POLICY_MATCH_STRICT; ++ int i, pos; ++ ++ if (sp == NULL) ++ return -1; ++ if (strict && info->len != sp->len) ++ return 0; ++ ++ for (i = sp->len - 1; i >= 0; i--) { ++ pos = strict ? i - sp->len + 1 : 0; ++ if (pos >= info->len) ++ return 0; ++ e = &info->pol[pos]; ++ ++ if (match_xfrm_state(sp->x[i].xvec, e)) { ++ if (!strict) ++ return 1; ++ } else if (strict) ++ return 0; ++ } ++ ++ return strict ? 1 : 0; ++} ++ ++static int ++match_policy_out(const struct sk_buff *skb, const struct ip6t_policy_info *info) ++{ ++ const struct ip6t_policy_elem *e; ++ struct dst_entry *dst = skb->dst; ++ int strict = info->flags & POLICY_MATCH_STRICT; ++ int i, pos; ++ ++ if (dst->xfrm == NULL) ++ return -1; ++ ++ for (i = 0; dst && dst->xfrm; dst = dst->child, i++) { ++ pos = strict ? i : 0; ++ if (pos >= info->len) ++ return 0; ++ e = &info->pol[pos]; ++ ++ if (match_xfrm_state(dst->xfrm, e)) { ++ if (!strict) ++ return 1; ++ } else if (strict) ++ return 0; ++ } ++ ++ return strict ? 1 : 0; ++} ++ ++static int match(const struct sk_buff *skb, ++ const struct net_device *in, ++ const struct net_device *out, ++ const void *matchinfo, ++ int offset, ++ unsigned int protoff, ++ int *hotdrop) ++{ ++ const struct ip6t_policy_info *info = matchinfo; ++ int ret; ++ ++ if (info->flags & POLICY_MATCH_IN) ++ ret = match_policy_in(skb, info); ++ else ++ ret = match_policy_out(skb, info); ++ ++ if (ret < 0) { ++ if (info->flags & POLICY_MATCH_NONE) ++ ret = 1; ++ else ++ ret = 0; ++ } else if (info->flags & POLICY_MATCH_NONE) ++ ret = 0; ++ ++ return ret; ++} ++ ++static int checkentry(const char *tablename, const struct ip6t_ip6 *ip, ++ void *matchinfo, unsigned int matchsize, ++ unsigned int hook_mask) ++{ ++ struct ip6t_policy_info *info = matchinfo; ++ ++ if (matchsize != IP6T_ALIGN(sizeof(*info))) { ++ printk(KERN_ERR "ip6t_policy: matchsize %u != %zu\n", ++ matchsize, IP6T_ALIGN(sizeof(*info))); ++ return 0; ++ } ++ if (!(info->flags & (POLICY_MATCH_IN|POLICY_MATCH_OUT))) { ++ printk(KERN_ERR "ip6t_policy: neither incoming nor " ++ "outgoing policy selected\n"); ++ return 0; ++ } ++ if (hook_mask & (1 << NF_IP6_PRE_ROUTING | 1 << NF_IP6_LOCAL_IN) ++ && info->flags & POLICY_MATCH_OUT) { ++ printk(KERN_ERR "ip6t_policy: output policy not valid in " ++ "PRE_ROUTING and INPUT\n"); ++ return 0; ++ } ++ if (hook_mask & (1 << NF_IP6_POST_ROUTING | 1 << NF_IP6_LOCAL_OUT) ++ && info->flags & POLICY_MATCH_IN) { ++ printk(KERN_ERR "ip6t_policy: input policy not valid in " ++ "POST_ROUTING and OUTPUT\n"); ++ return 0; ++ } ++ if (info->len > POLICY_MAX_ELEM) { ++ printk(KERN_ERR "ip6t_policy: too many policy elements\n"); ++ return 0; ++ } ++ ++ return 1; ++} ++ ++static struct ip6t_match policy_match = ++{ ++ .name = "policy", ++ .match = match, ++ .checkentry = checkentry, ++ .me = THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++ return ip6t_register_match(&policy_match); ++} ++ ++static void __exit fini(void) ++{ ++ ip6t_unregister_match(&policy_match); ++} ++ ++module_init(init); ++module_exit(fini); ================================================================ Index: SOURCES/iptables-nf-policy.patch diff -u /dev/null SOURCES/iptables-nf-policy.patch:1.1.2.1 --- /dev/null Thu Sep 15 10:33:18 2005 +++ SOURCES/iptables-nf-policy.patch Thu Sep 15 10:33:13 2005 @@ -0,0 +1,1030 @@ + .policy-test | 3 + .policy-test6 | 3 + libip6t_policy.c | 471 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + libip6t_policy.man | 46 +++++ + libipt_policy.c | 429 ++++++++++++++++++++++++++++++++++++++++++++++++ + libipt_policy.man | 46 +++++ + 6 files changed, 998 insertions(+) + +diff -Nur --exclude '*.orig' iptables.org/extensions/.policy-test iptables/extensions/.policy-test +--- iptables.org/extensions/.policy-test 1970-01-01 01:00:00.000000000 +0100 ++++ iptables/extensions/.policy-test 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,3 @@ ++#!/bin/sh ++# ++[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_policy.h ] && echo policy +diff -Nur --exclude '*.orig' iptables.org/extensions/.policy-test6 iptables/extensions/.policy-test6 +--- iptables.org/extensions/.policy-test6 1970-01-01 01:00:00.000000000 +0100 ++++ iptables/extensions/.policy-test6 2005-09-15 10:23:16.000000000 +0200 +@@ -0,0 +1,3 @@ ++#!/bin/sh ++# ++[ -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_policy.h ] && echo policy +diff -Nur --exclude '*.orig' iptables.org/extensions/libip6t_policy.c iptables/extensions/libip6t_policy.c +--- iptables.org/extensions/libip6t_policy.c 1970-01-01 01:00:00.000000000 +0100 ++++ iptables/extensions/libip6t_policy.c 2005-09-15 10:23:16.000000000 +0200 <<Diff was trimmed, longer than 597 lines>> _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit