aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-03-20 21:03:40 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-20 21:03:40 -0500
commitc4b885139203d37f76662c37ae645fe8e0f4e4e5 (patch)
tree5cedf4d632b273df81bf1712b95dbc8b96cdc0e4 /net/ipv6
parentf2ffd9eeda82b476c034d733be08ecf6a87d2edf (diff)
[NETFILTER]: x_tables: replace IPv4/IPv6 policy match by address family independant version
Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/Kconfig10
-rw-r--r--net/ipv6/netfilter/Makefile1
-rw-r--r--net/ipv6/netfilter/ip6t_policy.c174
3 files changed, 0 insertions, 185 deletions
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 2d6f8ecbc27b..98f78759f1ab 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -133,16 +133,6 @@ config IP6_NF_MATCH_EUI64
133 133
134 To compile it as a module, choose M here. If unsure, say N. 134 To compile it as a module, choose M here. If unsure, say N.
135 135
136config IP6_NF_MATCH_POLICY
137 tristate "IPsec policy match support"
138 depends on IP6_NF_IPTABLES && XFRM
139 help
140 Policy matching allows you to match packets based on the
141 IPsec policy that was used during decapsulation/will
142 be used during encapsulation.
143
144 To compile it as a module, choose M here. If unsure, say N.
145
146# The targets 136# The targets
147config IP6_NF_FILTER 137config IP6_NF_FILTER
148 tristate "Packet filtering" 138 tristate "Packet filtering"
diff --git a/net/ipv6/netfilter/Makefile b/net/ipv6/netfilter/Makefile
index db6073c94163..8436a1a1731f 100644
--- a/net/ipv6/netfilter/Makefile
+++ b/net/ipv6/netfilter/Makefile
@@ -9,7 +9,6 @@ obj-$(CONFIG_IP6_NF_MATCH_OPTS) += ip6t_hbh.o ip6t_dst.o
9obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o 9obj-$(CONFIG_IP6_NF_MATCH_IPV6HEADER) += ip6t_ipv6header.o
10obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o 10obj-$(CONFIG_IP6_NF_MATCH_FRAG) += ip6t_frag.o
11obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o 11obj-$(CONFIG_IP6_NF_MATCH_AHESP) += ip6t_esp.o ip6t_ah.o
12obj-$(CONFIG_IP6_NF_MATCH_POLICY) += ip6t_policy.o
13obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o 12obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o
14obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o 13obj-$(CONFIG_IP6_NF_MATCH_MULTIPORT) += ip6t_multiport.o
15obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o 14obj-$(CONFIG_IP6_NF_MATCH_OWNER) += ip6t_owner.o
diff --git a/net/ipv6/netfilter/ip6t_policy.c b/net/ipv6/netfilter/ip6t_policy.c
deleted file mode 100644
index f2a59970e007..000000000000
--- a/net/ipv6/netfilter/ip6t_policy.c
+++ /dev/null
@@ -1,174 +0,0 @@
1/* IP tables module for matching IPsec policy
2 *
3 * Copyright (c) 2004,2005 Patrick McHardy, <kaber@trash.net>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 */
9
10#include <linux/kernel.h>
11#include <linux/config.h>
12#include <linux/module.h>
13#include <linux/skbuff.h>
14#include <linux/init.h>
15#include <net/xfrm.h>
16
17#include <linux/netfilter_ipv6.h>
18#include <linux/netfilter_ipv6/ip6_tables.h>
19#include <linux/netfilter_ipv6/ip6t_policy.h>
20
21MODULE_AUTHOR("Patrick McHardy <kaber@trash.net>");
22MODULE_DESCRIPTION("IPtables IPsec policy matching module");
23MODULE_LICENSE("GPL");
24
25
26static inline int
27match_xfrm_state(struct xfrm_state *x, const struct ip6t_policy_elem *e)
28{
29#define MATCH_ADDR(x,y,z) (!e->match.x || \
30 ((!ipv6_masked_addr_cmp(&e->x.a6, &e->y.a6, \
31 z)) \
32 ^ e->invert.x))
33#define MATCH(x,y) (!e->match.x || ((e->x == (y)) ^ e->invert.x))
34
35 return MATCH_ADDR(saddr, smask, (struct in6_addr *)&x->props.saddr.a6) &&
36 MATCH_ADDR(daddr, dmask, (struct in6_addr *)&x->id.daddr.a6) &&
37 MATCH(proto, x->id.proto) &&
38 MATCH(mode, x->props.mode) &&
39 MATCH(spi, x->id.spi) &&
40 MATCH(reqid, x->props.reqid);
41}
42
43static int
44match_policy_in(const struct sk_buff *skb, const struct ip6t_policy_info *info)
45{
46 const struct ip6t_policy_elem *e;
47 struct sec_path *sp = skb->sp;
48 int strict = info->flags & IP6T_POLICY_MATCH_STRICT;
49 int i, pos;
50
51 if (sp == NULL)
52 return -1;
53 if (strict && info->len != sp->len)
54 return 0;
55
56 for (i = sp->len - 1; i >= 0; i--) {
57 pos = strict ? i - sp->len + 1 : 0;
58 if (pos >= info->len)
59 return 0;
60 e = &info->pol[pos];
61
62 if (match_xfrm_state(sp->x[i].xvec, e)) {
63 if (!strict)
64 return 1;
65 } else if (strict)
66 return 0;
67 }
68
69 return strict ? 1 : 0;
70}
71
72static int
73match_policy_out(const struct sk_buff *skb, const struct ip6t_policy_info *info)
74{
75 const struct ip6t_policy_elem *e;
76 struct dst_entry *dst = skb->dst;
77 int strict = info->flags & IP6T_POLICY_MATCH_STRICT;
78 int i, pos;
79
80 if (dst->xfrm == NULL)
81 return -1;
82
83 for (i = 0; dst && dst->xfrm; dst = dst->child, i++) {
84 pos = strict ? i : 0;
85 if (pos >= info->len)
86 return 0;
87 e = &info->pol[pos];
88
89 if (match_xfrm_state(dst->xfrm, e)) {
90 if (!strict)
91 return 1;
92 } else if (strict)
93 return 0;
94 }
95
96 return strict ? i == info->len : 0;
97}
98
99static int match(const struct sk_buff *skb,
100 const struct net_device *in,
101 const struct net_device *out,
102 const struct xt_match *match,
103 const void *matchinfo,
104 int offset,
105 unsigned int protoff,
106 int *hotdrop)
107{
108 const struct ip6t_policy_info *info = matchinfo;
109 int ret;
110
111 if (info->flags & IP6T_POLICY_MATCH_IN)
112 ret = match_policy_in(skb, info);
113 else
114 ret = match_policy_out(skb, info);
115
116 if (ret < 0)
117 ret = info->flags & IP6T_POLICY_MATCH_NONE ? 1 : 0;
118 else if (info->flags & IP6T_POLICY_MATCH_NONE)
119 ret = 0;
120
121 return ret;
122}
123
124static int checkentry(const char *tablename, const void *ip_void,
125 const struct xt_match *match, void *matchinfo,
126 unsigned int matchsize, unsigned int hook_mask)
127{
128 struct ip6t_policy_info *info = matchinfo;
129
130 if (!(info->flags & (IP6T_POLICY_MATCH_IN|IP6T_POLICY_MATCH_OUT))) {
131 printk(KERN_ERR "ip6t_policy: neither incoming nor "
132 "outgoing policy selected\n");
133 return 0;
134 }
135 if (hook_mask & (1 << NF_IP6_PRE_ROUTING | 1 << NF_IP6_LOCAL_IN)
136 && info->flags & IP6T_POLICY_MATCH_OUT) {
137 printk(KERN_ERR "ip6t_policy: output policy not valid in "
138 "PRE_ROUTING and INPUT\n");
139 return 0;
140 }
141 if (hook_mask & (1 << NF_IP6_POST_ROUTING | 1 << NF_IP6_LOCAL_OUT)
142 && info->flags & IP6T_POLICY_MATCH_IN) {
143 printk(KERN_ERR "ip6t_policy: input policy not valid in "
144 "POST_ROUTING and OUTPUT\n");
145 return 0;
146 }
147 if (info->len > IP6T_POLICY_MAX_ELEM) {
148 printk(KERN_ERR "ip6t_policy: too many policy elements\n");
149 return 0;
150 }
151
152 return 1;
153}
154
155static struct ip6t_match policy_match = {
156 .name = "policy",
157 .match = match,
158 .matchsize = sizeof(struct ip6t_policy_info),
159 .checkentry = checkentry,
160 .me = THIS_MODULE,
161};
162
163static int __init init(void)
164{
165 return ip6t_register_match(&policy_match);
166}
167
168static void __exit fini(void)
169{
170 ip6t_unregister_match(&policy_match);
171}
172
173module_init(init);
174module_exit(fini);
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-27 00:33:33 -0500