Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 41fef0ee7b8f3fe3f3dd2ddc9b170f3d88bce595

Authored by Marcin Slusarz
Committed by David S. Miller
1 parent c800578510
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

xfrm: convert empty xfrm_audit_* macros to functions 

it removes these warnings when CONFIG_AUDITSYSCALL is unset:

net/xfrm/xfrm_user.c: In function 'xfrm_add_sa':
net/xfrm/xfrm_user.c:412: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:411: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:410: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_del_sa':
net/xfrm/xfrm_user.c:485: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:484: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:483: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_policy':
net/xfrm/xfrm_user.c:1132: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1131: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1130: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
net/xfrm/xfrm_user.c:1382: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1381: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1380: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
net/xfrm/xfrm_user.c:1620: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1619: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1618: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa_expire':
net/xfrm/xfrm_user.c:1658: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1657: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1656: warning: unused variable 'loginuid'

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 40 additions and 8 deletions Inline Diff

1 #ifndef _NET_XFRM_H 1 #ifndef _NET_XFRM_H
2 #define _NET_XFRM_H 2 #define _NET_XFRM_H
3 3
4 #include <linux/compiler.h> 4 #include <linux/compiler.h>
5 #include <linux/xfrm.h> 5 #include <linux/xfrm.h>
6 #include <linux/spinlock.h> 6 #include <linux/spinlock.h>
7 #include <linux/list.h> 7 #include <linux/list.h>
8 #include <linux/skbuff.h> 8 #include <linux/skbuff.h>
9 #include <linux/socket.h> 9 #include <linux/socket.h>
10 #include <linux/pfkeyv2.h> 10 #include <linux/pfkeyv2.h>
11 #include <linux/ipsec.h> 11 #include <linux/ipsec.h>
12 #include <linux/in6.h> 12 #include <linux/in6.h>
13 #include <linux/mutex.h> 13 #include <linux/mutex.h>
14 #include <linux/audit.h> 14 #include <linux/audit.h>
15 15
16 #include <net/sock.h> 16 #include <net/sock.h>
17 #include <net/dst.h> 17 #include <net/dst.h>
18 #include <net/ip.h> 18 #include <net/ip.h>
19 #include <net/route.h> 19 #include <net/route.h>
20 #include <net/ipv6.h> 20 #include <net/ipv6.h>
21 #include <net/ip6_fib.h> 21 #include <net/ip6_fib.h>
22 #ifdef CONFIG_XFRM_STATISTICS 22 #ifdef CONFIG_XFRM_STATISTICS
23 #include <net/snmp.h> 23 #include <net/snmp.h>
24 #endif 24 #endif
25 25
26 #define XFRM_PROTO_ESP 50 26 #define XFRM_PROTO_ESP 50
27 #define XFRM_PROTO_AH 51 27 #define XFRM_PROTO_AH 51
28 #define XFRM_PROTO_COMP 108 28 #define XFRM_PROTO_COMP 108
29 #define XFRM_PROTO_IPIP 4 29 #define XFRM_PROTO_IPIP 4
30 #define XFRM_PROTO_IPV6 41 30 #define XFRM_PROTO_IPV6 41
31 #define XFRM_PROTO_ROUTING IPPROTO_ROUTING 31 #define XFRM_PROTO_ROUTING IPPROTO_ROUTING
32 #define XFRM_PROTO_DSTOPTS IPPROTO_DSTOPTS 32 #define XFRM_PROTO_DSTOPTS IPPROTO_DSTOPTS
33 33
34 #define XFRM_ALIGN8(len) (((len) + 7) & ~7) 34 #define XFRM_ALIGN8(len) (((len) + 7) & ~7)
35 #define MODULE_ALIAS_XFRM_MODE(family, encap) \ 35 #define MODULE_ALIAS_XFRM_MODE(family, encap) \
36 MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap)) 36 MODULE_ALIAS("xfrm-mode-" __stringify(family) "-" __stringify(encap))
37 #define MODULE_ALIAS_XFRM_TYPE(family, proto) \ 37 #define MODULE_ALIAS_XFRM_TYPE(family, proto) \
38 MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto)) 38 MODULE_ALIAS("xfrm-type-" __stringify(family) "-" __stringify(proto))
39 39
40 #ifdef CONFIG_XFRM_STATISTICS 40 #ifdef CONFIG_XFRM_STATISTICS
41 DECLARE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics); 41 DECLARE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics);
42 #define XFRM_INC_STATS(field) SNMP_INC_STATS(xfrm_statistics, field) 42 #define XFRM_INC_STATS(field) SNMP_INC_STATS(xfrm_statistics, field)
43 #define XFRM_INC_STATS_BH(field) SNMP_INC_STATS_BH(xfrm_statistics, field) 43 #define XFRM_INC_STATS_BH(field) SNMP_INC_STATS_BH(xfrm_statistics, field)
44 #define XFRM_INC_STATS_USER(field) SNMP_INC_STATS_USER(xfrm_statistics, field) 44 #define XFRM_INC_STATS_USER(field) SNMP_INC_STATS_USER(xfrm_statistics, field)
45 #else 45 #else
46 #define XFRM_INC_STATS(field) 46 #define XFRM_INC_STATS(field)
47 #define XFRM_INC_STATS_BH(field) 47 #define XFRM_INC_STATS_BH(field)
48 #define XFRM_INC_STATS_USER(field) 48 #define XFRM_INC_STATS_USER(field)
49 #endif 49 #endif
50 50
51 extern struct sock *xfrm_nl; 51 extern struct sock *xfrm_nl;
52 extern u32 sysctl_xfrm_aevent_etime; 52 extern u32 sysctl_xfrm_aevent_etime;
53 extern u32 sysctl_xfrm_aevent_rseqth; 53 extern u32 sysctl_xfrm_aevent_rseqth;
54 extern int sysctl_xfrm_larval_drop; 54 extern int sysctl_xfrm_larval_drop;
55 extern u32 sysctl_xfrm_acq_expires; 55 extern u32 sysctl_xfrm_acq_expires;
56 56
57 extern struct mutex xfrm_cfg_mutex; 57 extern struct mutex xfrm_cfg_mutex;
58 58
59 /* Organization of SPD aka "XFRM rules" 59 /* Organization of SPD aka "XFRM rules"
60 ------------------------------------ 60 ------------------------------------
61 61
62 Basic objects: 62 Basic objects:
63 - policy rule, struct xfrm_policy (=SPD entry) 63 - policy rule, struct xfrm_policy (=SPD entry)
64 - bundle of transformations, struct dst_entry == struct xfrm_dst (=SA bundle) 64 - bundle of transformations, struct dst_entry == struct xfrm_dst (=SA bundle)
65 - instance of a transformer, struct xfrm_state (=SA) 65 - instance of a transformer, struct xfrm_state (=SA)
66 - template to clone xfrm_state, struct xfrm_tmpl 66 - template to clone xfrm_state, struct xfrm_tmpl
67 67
68 SPD is plain linear list of xfrm_policy rules, ordered by priority. 68 SPD is plain linear list of xfrm_policy rules, ordered by priority.
69 (To be compatible with existing pfkeyv2 implementations, 69 (To be compatible with existing pfkeyv2 implementations,
70 many rules with priority of 0x7fffffff are allowed to exist and 70 many rules with priority of 0x7fffffff are allowed to exist and
71 such rules are ordered in an unpredictable way, thanks to bsd folks.) 71 such rules are ordered in an unpredictable way, thanks to bsd folks.)
72 72
73 Lookup is plain linear search until the first match with selector. 73 Lookup is plain linear search until the first match with selector.
74 74
75 If "action" is "block", then we prohibit the flow, otherwise: 75 If "action" is "block", then we prohibit the flow, otherwise:
76 if "xfrms_nr" is zero, the flow passes untransformed. Otherwise, 76 if "xfrms_nr" is zero, the flow passes untransformed. Otherwise,
77 policy entry has list of up to XFRM_MAX_DEPTH transformations, 77 policy entry has list of up to XFRM_MAX_DEPTH transformations,
78 described by templates xfrm_tmpl. Each template is resolved 78 described by templates xfrm_tmpl. Each template is resolved
79 to a complete xfrm_state (see below) and we pack bundle of transformations 79 to a complete xfrm_state (see below) and we pack bundle of transformations
80 to a dst_entry returned to requestor. 80 to a dst_entry returned to requestor.
81 81
82 dst -. xfrm .-> xfrm_state #1 82 dst -. xfrm .-> xfrm_state #1
83 |---. child .-> dst -. xfrm .-> xfrm_state #2 83 |---. child .-> dst -. xfrm .-> xfrm_state #2
84 |---. child .-> dst -. xfrm .-> xfrm_state #3 84 |---. child .-> dst -. xfrm .-> xfrm_state #3
85 |---. child .-> NULL 85 |---. child .-> NULL
86 86
87 Bundles are cached at xrfm_policy struct (field ->bundles). 87 Bundles are cached at xrfm_policy struct (field ->bundles).
88 88
89 89
90 Resolution of xrfm_tmpl 90 Resolution of xrfm_tmpl
91 ----------------------- 91 -----------------------
92 Template contains: 92 Template contains:
93 1. ->mode Mode: transport or tunnel 93 1. ->mode Mode: transport or tunnel
94 2. ->id.proto Protocol: AH/ESP/IPCOMP 94 2. ->id.proto Protocol: AH/ESP/IPCOMP
95 3. ->id.daddr Remote tunnel endpoint, ignored for transport mode. 95 3. ->id.daddr Remote tunnel endpoint, ignored for transport mode.
96 Q: allow to resolve security gateway? 96 Q: allow to resolve security gateway?
97 4. ->id.spi If not zero, static SPI. 97 4. ->id.spi If not zero, static SPI.
98 5. ->saddr Local tunnel endpoint, ignored for transport mode. 98 5. ->saddr Local tunnel endpoint, ignored for transport mode.
99 6. ->algos List of allowed algos. Plain bitmask now. 99 6. ->algos List of allowed algos. Plain bitmask now.
100 Q: ealgos, aalgos, calgos. What a mess... 100 Q: ealgos, aalgos, calgos. What a mess...
101 7. ->share Sharing mode. 101 7. ->share Sharing mode.
102 Q: how to implement private sharing mode? To add struct sock* to 102 Q: how to implement private sharing mode? To add struct sock* to
103 flow id? 103 flow id?
104 104
105 Having this template we search through SAD searching for entries 105 Having this template we search through SAD searching for entries
106 with appropriate mode/proto/algo, permitted by selector. 106 with appropriate mode/proto/algo, permitted by selector.
107 If no appropriate entry found, it is requested from key manager. 107 If no appropriate entry found, it is requested from key manager.
108 108
109 PROBLEMS: 109 PROBLEMS:
110 Q: How to find all the bundles referring to a physical path for 110 Q: How to find all the bundles referring to a physical path for
111 PMTU discovery? Seems, dst should contain list of all parents... 111 PMTU discovery? Seems, dst should contain list of all parents...
112 and enter to infinite locking hierarchy disaster. 112 and enter to infinite locking hierarchy disaster.
113 No! It is easier, we will not search for them, let them find us. 113 No! It is easier, we will not search for them, let them find us.
114 We add genid to each dst plus pointer to genid of raw IP route, 114 We add genid to each dst plus pointer to genid of raw IP route,
115 pmtu disc will update pmtu on raw IP route and increase its genid. 115 pmtu disc will update pmtu on raw IP route and increase its genid.
116 dst_check() will see this for top level and trigger resyncing 116 dst_check() will see this for top level and trigger resyncing
117 metrics. Plus, it will be made via sk->sk_dst_cache. Solved. 117 metrics. Plus, it will be made via sk->sk_dst_cache. Solved.
118 */ 118 */
119 119
120 /* Full description of state of transformer. */ 120 /* Full description of state of transformer. */
121 struct xfrm_state 121 struct xfrm_state
122 { 122 {
123 /* Note: bydst is re-used during gc */ 123 /* Note: bydst is re-used during gc */
124 struct list_head all; 124 struct list_head all;
125 struct hlist_node bydst; 125 struct hlist_node bydst;
126 struct hlist_node bysrc; 126 struct hlist_node bysrc;
127 struct hlist_node byspi; 127 struct hlist_node byspi;
128 128
129 atomic_t refcnt; 129 atomic_t refcnt;
130 spinlock_t lock; 130 spinlock_t lock;
131 131
132 struct xfrm_id id; 132 struct xfrm_id id;
133 struct xfrm_selector sel; 133 struct xfrm_selector sel;
134 134
135 u32 genid; 135 u32 genid;
136 136
137 /* Key manger bits */ 137 /* Key manger bits */
138 struct { 138 struct {
139 u8 state; 139 u8 state;
140 u8 dying; 140 u8 dying;
141 u32 seq; 141 u32 seq;
142 } km; 142 } km;
143 143
144 /* Parameters of this state. */ 144 /* Parameters of this state. */
145 struct { 145 struct {
146 u32 reqid; 146 u32 reqid;
147 u8 mode; 147 u8 mode;
148 u8 replay_window; 148 u8 replay_window;
149 u8 aalgo, ealgo, calgo; 149 u8 aalgo, ealgo, calgo;
150 u8 flags; 150 u8 flags;
151 u16 family; 151 u16 family;
152 xfrm_address_t saddr; 152 xfrm_address_t saddr;
153 int header_len; 153 int header_len;
154 int trailer_len; 154 int trailer_len;
155 } props; 155 } props;
156 156
157 struct xfrm_lifetime_cfg lft; 157 struct xfrm_lifetime_cfg lft;
158 158
159 /* Data for transformer */ 159 /* Data for transformer */
160 struct xfrm_algo *aalg; 160 struct xfrm_algo *aalg;
161 struct xfrm_algo *ealg; 161 struct xfrm_algo *ealg;
162 struct xfrm_algo *calg; 162 struct xfrm_algo *calg;
163 struct xfrm_algo_aead *aead; 163 struct xfrm_algo_aead *aead;
164 164
165 /* Data for encapsulator */ 165 /* Data for encapsulator */
166 struct xfrm_encap_tmpl *encap; 166 struct xfrm_encap_tmpl *encap;
167 167
168 /* Data for care-of address */ 168 /* Data for care-of address */
169 xfrm_address_t *coaddr; 169 xfrm_address_t *coaddr;
170 170
171 /* IPComp needs an IPIP tunnel for handling uncompressed packets */ 171 /* IPComp needs an IPIP tunnel for handling uncompressed packets */
172 struct xfrm_state *tunnel; 172 struct xfrm_state *tunnel;
173 173
174 /* If a tunnel, number of users + 1 */ 174 /* If a tunnel, number of users + 1 */
175 atomic_t tunnel_users; 175 atomic_t tunnel_users;
176 176
177 /* State for replay detection */ 177 /* State for replay detection */
178 struct xfrm_replay_state replay; 178 struct xfrm_replay_state replay;
179 179
180 /* Replay detection state at the time we sent the last notification */ 180 /* Replay detection state at the time we sent the last notification */
181 struct xfrm_replay_state preplay; 181 struct xfrm_replay_state preplay;
182 182
183 /* internal flag that only holds state for delayed aevent at the 183 /* internal flag that only holds state for delayed aevent at the
184 * moment 184 * moment
185 */ 185 */
186 u32 xflags; 186 u32 xflags;
187 187
188 /* Replay detection notification settings */ 188 /* Replay detection notification settings */
189 u32 replay_maxage; 189 u32 replay_maxage;
190 u32 replay_maxdiff; 190 u32 replay_maxdiff;
191 191
192 /* Replay detection notification timer */ 192 /* Replay detection notification timer */
193 struct timer_list rtimer; 193 struct timer_list rtimer;
194 194
195 /* Statistics */ 195 /* Statistics */
196 struct xfrm_stats stats; 196 struct xfrm_stats stats;
197 197
198 struct xfrm_lifetime_cur curlft; 198 struct xfrm_lifetime_cur curlft;
199 struct timer_list timer; 199 struct timer_list timer;
200 200
201 /* Last used time */ 201 /* Last used time */
202 unsigned long lastused; 202 unsigned long lastused;
203 203
204 /* Reference to data common to all the instances of this 204 /* Reference to data common to all the instances of this
205 * transformer. */ 205 * transformer. */
206 const struct xfrm_type *type; 206 const struct xfrm_type *type;
207 struct xfrm_mode *inner_mode; 207 struct xfrm_mode *inner_mode;
208 struct xfrm_mode *inner_mode_iaf; 208 struct xfrm_mode *inner_mode_iaf;
209 struct xfrm_mode *outer_mode; 209 struct xfrm_mode *outer_mode;
210 210
211 /* Security context */ 211 /* Security context */
212 struct xfrm_sec_ctx *security; 212 struct xfrm_sec_ctx *security;
213 213
214 /* Private data of this transformer, format is opaque, 214 /* Private data of this transformer, format is opaque,
215 * interpreted by xfrm_type methods. */ 215 * interpreted by xfrm_type methods. */
216 void *data; 216 void *data;
217 }; 217 };
218 218
219 /* xflags - make enum if more show up */ 219 /* xflags - make enum if more show up */
220 #define XFRM_TIME_DEFER 1 220 #define XFRM_TIME_DEFER 1
221 221
222 enum { 222 enum {
223 XFRM_STATE_VOID, 223 XFRM_STATE_VOID,
224 XFRM_STATE_ACQ, 224 XFRM_STATE_ACQ,
225 XFRM_STATE_VALID, 225 XFRM_STATE_VALID,
226 XFRM_STATE_ERROR, 226 XFRM_STATE_ERROR,
227 XFRM_STATE_EXPIRED, 227 XFRM_STATE_EXPIRED,
228 XFRM_STATE_DEAD 228 XFRM_STATE_DEAD
229 }; 229 };
230 230
231 /* callback structure passed from either netlink or pfkey */ 231 /* callback structure passed from either netlink or pfkey */
232 struct km_event 232 struct km_event
233 { 233 {
234 union { 234 union {
235 u32 hard; 235 u32 hard;
236 u32 proto; 236 u32 proto;
237 u32 byid; 237 u32 byid;
238 u32 aevent; 238 u32 aevent;
239 u32 type; 239 u32 type;
240 } data; 240 } data;
241 241
242 u32 seq; 242 u32 seq;
243 u32 pid; 243 u32 pid;
244 u32 event; 244 u32 event;
245 }; 245 };
246 246
247 struct net_device; 247 struct net_device;
248 struct xfrm_type; 248 struct xfrm_type;
249 struct xfrm_dst; 249 struct xfrm_dst;
250 struct xfrm_policy_afinfo { 250 struct xfrm_policy_afinfo {
251 unsigned short family; 251 unsigned short family;
252 struct dst_ops *dst_ops; 252 struct dst_ops *dst_ops;
253 void (*garbage_collect)(void); 253 void (*garbage_collect)(void);
254 struct dst_entry *(*dst_lookup)(int tos, xfrm_address_t *saddr, 254 struct dst_entry *(*dst_lookup)(int tos, xfrm_address_t *saddr,
255 xfrm_address_t *daddr); 255 xfrm_address_t *daddr);
256 int (*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr); 256 int (*get_saddr)(xfrm_address_t *saddr, xfrm_address_t *daddr);
257 struct dst_entry *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy); 257 struct dst_entry *(*find_bundle)(struct flowi *fl, struct xfrm_policy *policy);
258 void (*decode_session)(struct sk_buff *skb, 258 void (*decode_session)(struct sk_buff *skb,
259 struct flowi *fl, 259 struct flowi *fl,
260 int reverse); 260 int reverse);
261 int (*get_tos)(struct flowi *fl); 261 int (*get_tos)(struct flowi *fl);
262 int (*init_path)(struct xfrm_dst *path, 262 int (*init_path)(struct xfrm_dst *path,
263 struct dst_entry *dst, 263 struct dst_entry *dst,
264 int nfheader_len); 264 int nfheader_len);
265 int (*fill_dst)(struct xfrm_dst *xdst, 265 int (*fill_dst)(struct xfrm_dst *xdst,
266 struct net_device *dev); 266 struct net_device *dev);
267 }; 267 };
268 268
269 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); 269 extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
270 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo); 270 extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
271 extern void km_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c); 271 extern void km_policy_notify(struct xfrm_policy *xp, int dir, struct km_event *c);
272 extern void km_state_notify(struct xfrm_state *x, struct km_event *c); 272 extern void km_state_notify(struct xfrm_state *x, struct km_event *c);
273 273
274 struct xfrm_tmpl; 274 struct xfrm_tmpl;
275 extern int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol); 275 extern int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol);
276 extern void km_state_expired(struct xfrm_state *x, int hard, u32 pid); 276 extern void km_state_expired(struct xfrm_state *x, int hard, u32 pid);
277 extern int __xfrm_state_delete(struct xfrm_state *x); 277 extern int __xfrm_state_delete(struct xfrm_state *x);
278 278
279 struct xfrm_state_afinfo { 279 struct xfrm_state_afinfo {
280 unsigned int family; 280 unsigned int family;
281 unsigned int proto; 281 unsigned int proto;
282 __be16 eth_proto; 282 __be16 eth_proto;
283 struct module *owner; 283 struct module *owner;
284 const struct xfrm_type *type_map[IPPROTO_MAX]; 284 const struct xfrm_type *type_map[IPPROTO_MAX];
285 struct xfrm_mode *mode_map[XFRM_MODE_MAX]; 285 struct xfrm_mode *mode_map[XFRM_MODE_MAX];
286 int (*init_flags)(struct xfrm_state *x); 286 int (*init_flags)(struct xfrm_state *x);
287 void (*init_tempsel)(struct xfrm_state *x, struct flowi *fl, 287 void (*init_tempsel)(struct xfrm_state *x, struct flowi *fl,
288 struct xfrm_tmpl *tmpl, 288 struct xfrm_tmpl *tmpl,
289 xfrm_address_t *daddr, xfrm_address_t *saddr); 289 xfrm_address_t *daddr, xfrm_address_t *saddr);
290 int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n); 290 int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
291 int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n); 291 int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
292 int (*output)(struct sk_buff *skb); 292 int (*output)(struct sk_buff *skb);
293 int (*extract_input)(struct xfrm_state *x, 293 int (*extract_input)(struct xfrm_state *x,
294 struct sk_buff *skb); 294 struct sk_buff *skb);
295 int (*extract_output)(struct xfrm_state *x, 295 int (*extract_output)(struct xfrm_state *x,
296 struct sk_buff *skb); 296 struct sk_buff *skb);
297 int (*transport_finish)(struct sk_buff *skb, 297 int (*transport_finish)(struct sk_buff *skb,
298 int async); 298 int async);
299 }; 299 };
300 300
301 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo); 301 extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
302 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); 302 extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
303 303
304 extern void xfrm_state_delete_tunnel(struct xfrm_state *x); 304 extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
305 305
306 struct xfrm_type 306 struct xfrm_type
307 { 307 {
308 char *description; 308 char *description;
309 struct module *owner; 309 struct module *owner;
310 __u8 proto; 310 __u8 proto;
311 __u8 flags; 311 __u8 flags;
312 #define XFRM_TYPE_NON_FRAGMENT 1 312 #define XFRM_TYPE_NON_FRAGMENT 1
313 #define XFRM_TYPE_REPLAY_PROT 2 313 #define XFRM_TYPE_REPLAY_PROT 2
314 #define XFRM_TYPE_LOCAL_COADDR 4 314 #define XFRM_TYPE_LOCAL_COADDR 4
315 #define XFRM_TYPE_REMOTE_COADDR 8 315 #define XFRM_TYPE_REMOTE_COADDR 8
316 316
317 int (*init_state)(struct xfrm_state *x); 317 int (*init_state)(struct xfrm_state *x);
318 void (*destructor)(struct xfrm_state *); 318 void (*destructor)(struct xfrm_state *);
319 int (*input)(struct xfrm_state *, struct sk_buff *skb); 319 int (*input)(struct xfrm_state *, struct sk_buff *skb);
320 int (*output)(struct xfrm_state *, struct sk_buff *pskb); 320 int (*output)(struct xfrm_state *, struct sk_buff *pskb);
321 int (*reject)(struct xfrm_state *, struct sk_buff *, struct flowi *); 321 int (*reject)(struct xfrm_state *, struct sk_buff *, struct flowi *);
322 int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **); 322 int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
323 /* Estimate maximal size of result of transformation of a dgram */ 323 /* Estimate maximal size of result of transformation of a dgram */
324 u32 (*get_mtu)(struct xfrm_state *, int size); 324 u32 (*get_mtu)(struct xfrm_state *, int size);
325 }; 325 };
326 326
327 extern int xfrm_register_type(const struct xfrm_type *type, unsigned short family); 327 extern int xfrm_register_type(const struct xfrm_type *type, unsigned short family);
328 extern int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family); 328 extern int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family);
329 329
330 struct xfrm_mode { 330 struct xfrm_mode {
331 /* 331 /*
332 * Remove encapsulation header. 332 * Remove encapsulation header.
333 * 333 *
334 * The IP header will be moved over the top of the encapsulation 334 * The IP header will be moved over the top of the encapsulation
335 * header. 335 * header.
336 * 336 *
337 * On entry, the transport header shall point to where the IP header 337 * On entry, the transport header shall point to where the IP header
338 * should be and the network header shall be set to where the IP 338 * should be and the network header shall be set to where the IP
339 * header currently is. skb->data shall point to the start of the 339 * header currently is. skb->data shall point to the start of the
340 * payload. 340 * payload.
341 */ 341 */
342 int (*input2)(struct xfrm_state *x, struct sk_buff *skb); 342 int (*input2)(struct xfrm_state *x, struct sk_buff *skb);
343 343
344 /* 344 /*
345 * This is the actual input entry point. 345 * This is the actual input entry point.
346 * 346 *
347 * For transport mode and equivalent this would be identical to 347 * For transport mode and equivalent this would be identical to
348 * input2 (which does not need to be set). While tunnel mode 348 * input2 (which does not need to be set). While tunnel mode
349 * and equivalent would set this to the tunnel encapsulation function 349 * and equivalent would set this to the tunnel encapsulation function
350 * xfrm4_prepare_input that would in turn call input2. 350 * xfrm4_prepare_input that would in turn call input2.
351 */ 351 */
352 int (*input)(struct xfrm_state *x, struct sk_buff *skb); 352 int (*input)(struct xfrm_state *x, struct sk_buff *skb);
353 353
354 /* 354 /*
355 * Add encapsulation header. 355 * Add encapsulation header.
356 * 356 *
357 * On exit, the transport header will be set to the start of the 357 * On exit, the transport header will be set to the start of the
358 * encapsulation header to be filled in by x->type->output and 358 * encapsulation header to be filled in by x->type->output and
359 * the mac header will be set to the nextheader (protocol for 359 * the mac header will be set to the nextheader (protocol for
360 * IPv4) field of the extension header directly preceding the 360 * IPv4) field of the extension header directly preceding the
361 * encapsulation header, or in its absence, that of the top IP 361 * encapsulation header, or in its absence, that of the top IP
362 * header. The value of the network header will always point 362 * header. The value of the network header will always point
363 * to the top IP header while skb->data will point to the payload. 363 * to the top IP header while skb->data will point to the payload.
364 */ 364 */
365 int (*output2)(struct xfrm_state *x,struct sk_buff *skb); 365 int (*output2)(struct xfrm_state *x,struct sk_buff *skb);
366 366
367 /* 367 /*
368 * This is the actual output entry point. 368 * This is the actual output entry point.
369 * 369 *
370 * For transport mode and equivalent this would be identical to 370 * For transport mode and equivalent this would be identical to
371 * output2 (which does not need to be set). While tunnel mode 371 * output2 (which does not need to be set). While tunnel mode
372 * and equivalent would set this to a tunnel encapsulation function 372 * and equivalent would set this to a tunnel encapsulation function
373 * (xfrm4_prepare_output or xfrm6_prepare_output) that would in turn 373 * (xfrm4_prepare_output or xfrm6_prepare_output) that would in turn
374 * call output2. 374 * call output2.
375 */ 375 */
376 int (*output)(struct xfrm_state *x, struct sk_buff *skb); 376 int (*output)(struct xfrm_state *x, struct sk_buff *skb);
377 377
378 struct xfrm_state_afinfo *afinfo; 378 struct xfrm_state_afinfo *afinfo;
379 struct module *owner; 379 struct module *owner;
380 unsigned int encap; 380 unsigned int encap;
381 int flags; 381 int flags;
382 }; 382 };
383 383
384 /* Flags for xfrm_mode. */ 384 /* Flags for xfrm_mode. */
385 enum { 385 enum {
386 XFRM_MODE_FLAG_TUNNEL = 1, 386 XFRM_MODE_FLAG_TUNNEL = 1,
387 }; 387 };
388 388
389 extern int xfrm_register_mode(struct xfrm_mode *mode, int family); 389 extern int xfrm_register_mode(struct xfrm_mode *mode, int family);
390 extern int xfrm_unregister_mode(struct xfrm_mode *mode, int family); 390 extern int xfrm_unregister_mode(struct xfrm_mode *mode, int family);
391 391
392 static inline int xfrm_af2proto(unsigned int family) 392 static inline int xfrm_af2proto(unsigned int family)
393 { 393 {
394 switch(family) { 394 switch(family) {
395 case AF_INET: 395 case AF_INET:
396 return IPPROTO_IPIP; 396 return IPPROTO_IPIP;
397 case AF_INET6: 397 case AF_INET6:
398 return IPPROTO_IPV6; 398 return IPPROTO_IPV6;
399 default: 399 default:
400 return 0; 400 return 0;
401 } 401 }
402 } 402 }
403 403
404 static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipproto) 404 static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipproto)
405 { 405 {
406 if ((ipproto == IPPROTO_IPIP && x->props.family == AF_INET) || 406 if ((ipproto == IPPROTO_IPIP && x->props.family == AF_INET) ||
407 (ipproto == IPPROTO_IPV6 && x->props.family == AF_INET6)) 407 (ipproto == IPPROTO_IPV6 && x->props.family == AF_INET6))
408 return x->inner_mode; 408 return x->inner_mode;
409 else 409 else
410 return x->inner_mode_iaf; 410 return x->inner_mode_iaf;
411 } 411 }
412 412
413 struct xfrm_tmpl 413 struct xfrm_tmpl
414 { 414 {
415 /* id in template is interpreted as: 415 /* id in template is interpreted as:
416 * daddr - destination of tunnel, may be zero for transport mode. 416 * daddr - destination of tunnel, may be zero for transport mode.
417 * spi - zero to acquire spi. Not zero if spi is static, then 417 * spi - zero to acquire spi. Not zero if spi is static, then
418 * daddr must be fixed too. 418 * daddr must be fixed too.
419 * proto - AH/ESP/IPCOMP 419 * proto - AH/ESP/IPCOMP
420 */ 420 */
421 struct xfrm_id id; 421 struct xfrm_id id;
422 422
423 /* Source address of tunnel. Ignored, if it is not a tunnel. */ 423 /* Source address of tunnel. Ignored, if it is not a tunnel. */
424 xfrm_address_t saddr; 424 xfrm_address_t saddr;
425 425
426 unsigned short encap_family; 426 unsigned short encap_family;
427 427
428 __u32 reqid; 428 __u32 reqid;
429 429
430 /* Mode: transport, tunnel etc. */ 430 /* Mode: transport, tunnel etc. */
431 __u8 mode; 431 __u8 mode;
432 432
433 /* Sharing mode: unique, this session only, this user only etc. */ 433 /* Sharing mode: unique, this session only, this user only etc. */
434 __u8 share; 434 __u8 share;
435 435
436 /* May skip this transfomration if no SA is found */ 436 /* May skip this transfomration if no SA is found */
437 __u8 optional; 437 __u8 optional;
438 438
439 /* Skip aalgos/ealgos/calgos checks. */ 439 /* Skip aalgos/ealgos/calgos checks. */
440 __u8 allalgs; 440 __u8 allalgs;
441 441
442 /* Bit mask of algos allowed for acquisition */ 442 /* Bit mask of algos allowed for acquisition */
443 __u32 aalgos; 443 __u32 aalgos;
444 __u32 ealgos; 444 __u32 ealgos;
445 __u32 calgos; 445 __u32 calgos;
446 }; 446 };
447 447
448 #define XFRM_MAX_DEPTH 6 448 #define XFRM_MAX_DEPTH 6
449 449
450 struct xfrm_policy 450 struct xfrm_policy
451 { 451 {
452 struct xfrm_policy *next; 452 struct xfrm_policy *next;
453 struct list_head bytype; 453 struct list_head bytype;
454 struct hlist_node bydst; 454 struct hlist_node bydst;
455 struct hlist_node byidx; 455 struct hlist_node byidx;
456 456
457 /* This lock only affects elements except for entry. */ 457 /* This lock only affects elements except for entry. */
458 rwlock_t lock; 458 rwlock_t lock;
459 atomic_t refcnt; 459 atomic_t refcnt;
460 struct timer_list timer; 460 struct timer_list timer;
461 461
462 u32 priority; 462 u32 priority;
463 u32 index; 463 u32 index;
464 struct xfrm_selector selector; 464 struct xfrm_selector selector;
465 struct xfrm_lifetime_cfg lft; 465 struct xfrm_lifetime_cfg lft;
466 struct xfrm_lifetime_cur curlft; 466 struct xfrm_lifetime_cur curlft;
467 struct dst_entry *bundles; 467 struct dst_entry *bundles;
468 u16 family; 468 u16 family;
469 u8 type; 469 u8 type;
470 u8 action; 470 u8 action;
471 u8 flags; 471 u8 flags;
472 u8 dead; 472 u8 dead;
473 u8 xfrm_nr; 473 u8 xfrm_nr;
474 /* XXX 1 byte hole, try to pack */ 474 /* XXX 1 byte hole, try to pack */
475 struct xfrm_sec_ctx *security; 475 struct xfrm_sec_ctx *security;
476 struct xfrm_tmpl xfrm_vec[XFRM_MAX_DEPTH]; 476 struct xfrm_tmpl xfrm_vec[XFRM_MAX_DEPTH];
477 }; 477 };
478 478
479 struct xfrm_migrate { 479 struct xfrm_migrate {
480 xfrm_address_t old_daddr; 480 xfrm_address_t old_daddr;
481 xfrm_address_t old_saddr; 481 xfrm_address_t old_saddr;
482 xfrm_address_t new_daddr; 482 xfrm_address_t new_daddr;
483 xfrm_address_t new_saddr; 483 xfrm_address_t new_saddr;
484 u8 proto; 484 u8 proto;
485 u8 mode; 485 u8 mode;
486 u16 reserved; 486 u16 reserved;
487 u32 reqid; 487 u32 reqid;
488 u16 old_family; 488 u16 old_family;
489 u16 new_family; 489 u16 new_family;
490 }; 490 };
491 491
492 #define XFRM_KM_TIMEOUT 30 492 #define XFRM_KM_TIMEOUT 30
493 /* which seqno */ 493 /* which seqno */
494 #define XFRM_REPLAY_SEQ 1 494 #define XFRM_REPLAY_SEQ 1
495 #define XFRM_REPLAY_OSEQ 2 495 #define XFRM_REPLAY_OSEQ 2
496 #define XFRM_REPLAY_SEQ_MASK 3 496 #define XFRM_REPLAY_SEQ_MASK 3
497 /* what happened */ 497 /* what happened */
498 #define XFRM_REPLAY_UPDATE XFRM_AE_CR 498 #define XFRM_REPLAY_UPDATE XFRM_AE_CR
499 #define XFRM_REPLAY_TIMEOUT XFRM_AE_CE 499 #define XFRM_REPLAY_TIMEOUT XFRM_AE_CE
500 500
501 /* default aevent timeout in units of 100ms */ 501 /* default aevent timeout in units of 100ms */
502 #define XFRM_AE_ETIME 10 502 #define XFRM_AE_ETIME 10
503 /* Async Event timer multiplier */ 503 /* Async Event timer multiplier */
504 #define XFRM_AE_ETH_M 10 504 #define XFRM_AE_ETH_M 10
505 /* default seq threshold size */ 505 /* default seq threshold size */
506 #define XFRM_AE_SEQT_SIZE 2 506 #define XFRM_AE_SEQT_SIZE 2
507 507
508 struct xfrm_mgr 508 struct xfrm_mgr
509 { 509 {
510 struct list_head list; 510 struct list_head list;
511 char *id; 511 char *id;
512 int (*notify)(struct xfrm_state *x, struct km_event *c); 512 int (*notify)(struct xfrm_state *x, struct km_event *c);
513 int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir); 513 int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
514 struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir); 514 struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
515 int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); 515 int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
516 int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c); 516 int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
517 int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr); 517 int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
518 int (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles); 518 int (*migrate)(struct xfrm_selector *sel, u8 dir, u8 type, struct xfrm_migrate *m, int num_bundles);
519 }; 519 };
520 520
521 extern int xfrm_register_km(struct xfrm_mgr *km); 521 extern int xfrm_register_km(struct xfrm_mgr *km);
522 extern int xfrm_unregister_km(struct xfrm_mgr *km); 522 extern int xfrm_unregister_km(struct xfrm_mgr *km);
523 523
524 extern unsigned int xfrm_policy_count[XFRM_POLICY_MAX*2]; 524 extern unsigned int xfrm_policy_count[XFRM_POLICY_MAX*2];
525 525
526 /* 526 /*
527 * This structure is used for the duration where packets are being 527 * This structure is used for the duration where packets are being
528 * transformed by IPsec. As soon as the packet leaves IPsec the 528 * transformed by IPsec. As soon as the packet leaves IPsec the
529 * area beyond the generic IP part may be overwritten. 529 * area beyond the generic IP part may be overwritten.
530 */ 530 */
531 struct xfrm_skb_cb { 531 struct xfrm_skb_cb {
532 union { 532 union {
533 struct inet_skb_parm h4; 533 struct inet_skb_parm h4;
534 struct inet6_skb_parm h6; 534 struct inet6_skb_parm h6;
535 } header; 535 } header;
536 536
537 /* Sequence number for replay protection. */ 537 /* Sequence number for replay protection. */
538 union { 538 union {
539 u64 output; 539 u64 output;
540 __be32 input; 540 __be32 input;
541 } seq; 541 } seq;
542 }; 542 };
543 543
544 #define XFRM_SKB_CB(__skb) ((struct xfrm_skb_cb *)&((__skb)->cb[0])) 544 #define XFRM_SKB_CB(__skb) ((struct xfrm_skb_cb *)&((__skb)->cb[0]))
545 545
546 /* 546 /*
547 * This structure is used by the afinfo prepare_input/prepare_output functions 547 * This structure is used by the afinfo prepare_input/prepare_output functions
548 * to transmit header information to the mode input/output functions. 548 * to transmit header information to the mode input/output functions.
549 */ 549 */
550 struct xfrm_mode_skb_cb { 550 struct xfrm_mode_skb_cb {
551 union { 551 union {
552 struct inet_skb_parm h4; 552 struct inet_skb_parm h4;
553 struct inet6_skb_parm h6; 553 struct inet6_skb_parm h6;
554 } header; 554 } header;
555 555
556 /* Copied from header for IPv4, always set to zero and DF for IPv6. */ 556 /* Copied from header for IPv4, always set to zero and DF for IPv6. */
557 __be16 id; 557 __be16 id;
558 __be16 frag_off; 558 __be16 frag_off;
559 559
560 /* IP header length (excluding options or extension headers). */ 560 /* IP header length (excluding options or extension headers). */
561 u8 ihl; 561 u8 ihl;
562 562
563 /* TOS for IPv4, class for IPv6. */ 563 /* TOS for IPv4, class for IPv6. */
564 u8 tos; 564 u8 tos;
565 565
566 /* TTL for IPv4, hop limitfor IPv6. */ 566 /* TTL for IPv4, hop limitfor IPv6. */
567 u8 ttl; 567 u8 ttl;
568 568
569 /* Protocol for IPv4, NH for IPv6. */ 569 /* Protocol for IPv4, NH for IPv6. */
570 u8 protocol; 570 u8 protocol;
571 571
572 /* Option length for IPv4, zero for IPv6. */ 572 /* Option length for IPv4, zero for IPv6. */
573 u8 optlen; 573 u8 optlen;
574 574
575 /* Used by IPv6 only, zero for IPv4. */ 575 /* Used by IPv6 only, zero for IPv4. */
576 u8 flow_lbl[3]; 576 u8 flow_lbl[3];
577 }; 577 };
578 578
579 #define XFRM_MODE_SKB_CB(__skb) ((struct xfrm_mode_skb_cb *)&((__skb)->cb[0])) 579 #define XFRM_MODE_SKB_CB(__skb) ((struct xfrm_mode_skb_cb *)&((__skb)->cb[0]))
580 580
581 /* 581 /*
582 * This structure is used by the input processing to locate the SPI and 582 * This structure is used by the input processing to locate the SPI and
583 * related information. 583 * related information.
584 */ 584 */
585 struct xfrm_spi_skb_cb { 585 struct xfrm_spi_skb_cb {
586 union { 586 union {
587 struct inet_skb_parm h4; 587 struct inet_skb_parm h4;
588 struct inet6_skb_parm h6; 588 struct inet6_skb_parm h6;
589 } header; 589 } header;
590 590
591 unsigned int daddroff; 591 unsigned int daddroff;
592 unsigned int family; 592 unsigned int family;
593 }; 593 };
594 594
595 #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0])) 595 #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
596 596
597 /* Audit Information */ 597 /* Audit Information */
598 struct xfrm_audit 598 struct xfrm_audit
599 { 599 {
600 u32 secid; 600 u32 secid;
601 uid_t loginuid; 601 uid_t loginuid;
602 u32 sessionid; 602 u32 sessionid;
603 }; 603 };
604 604
605 #ifdef CONFIG_AUDITSYSCALL 605 #ifdef CONFIG_AUDITSYSCALL
606 static inline struct audit_buffer *xfrm_audit_start(const char *op) 606 static inline struct audit_buffer *xfrm_audit_start(const char *op)
607 { 607 {
608 struct audit_buffer *audit_buf = NULL; 608 struct audit_buffer *audit_buf = NULL;
609 609
610 if (audit_enabled == 0) 610 if (audit_enabled == 0)
611 return NULL; 611 return NULL;
612 audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC, 612 audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC,
613 AUDIT_MAC_IPSEC_EVENT); 613 AUDIT_MAC_IPSEC_EVENT);
614 if (audit_buf == NULL) 614 if (audit_buf == NULL)
615 return NULL; 615 return NULL;
616 audit_log_format(audit_buf, "op=%s", op); 616 audit_log_format(audit_buf, "op=%s", op);
617 return audit_buf; 617 return audit_buf;
618 } 618 }
619 619
620 static inline void xfrm_audit_helper_usrinfo(uid_t auid, u32 ses, u32 secid, 620 static inline void xfrm_audit_helper_usrinfo(uid_t auid, u32 ses, u32 secid,
621 struct audit_buffer *audit_buf) 621 struct audit_buffer *audit_buf)
622 { 622 {
623 char *secctx; 623 char *secctx;
624 u32 secctx_len; 624 u32 secctx_len;
625 625
626 audit_log_format(audit_buf, " auid=%u ses=%u", auid, ses); 626 audit_log_format(audit_buf, " auid=%u ses=%u", auid, ses);
627 if (secid != 0 && 627 if (secid != 0 &&
628 security_secid_to_secctx(secid, &secctx, &secctx_len) == 0) { 628 security_secid_to_secctx(secid, &secctx, &secctx_len) == 0) {
629 audit_log_format(audit_buf, " subj=%s", secctx); 629 audit_log_format(audit_buf, " subj=%s", secctx);
630 security_release_secctx(secctx, secctx_len); 630 security_release_secctx(secctx, secctx_len);
631 } else 631 } else
632 audit_log_task_context(audit_buf); 632 audit_log_task_context(audit_buf);
633 } 633 }
634 634
635 extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result, 635 extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
636 u32 auid, u32 ses, u32 secid); 636 u32 auid, u32 ses, u32 secid);
637 extern void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result, 637 extern void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
638 u32 auid, u32 ses, u32 secid); 638 u32 auid, u32 ses, u32 secid);
639 extern void xfrm_audit_state_add(struct xfrm_state *x, int result, 639 extern void xfrm_audit_state_add(struct xfrm_state *x, int result,
640 u32 auid, u32 ses, u32 secid); 640 u32 auid, u32 ses, u32 secid);
641 extern void xfrm_audit_state_delete(struct xfrm_state *x, int result, 641 extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,
642 u32 auid, u32 ses, u32 secid); 642 u32 auid, u32 ses, u32 secid);
643 extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x, 643 extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
644 struct sk_buff *skb); 644 struct sk_buff *skb);
645 extern void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family); 645 extern void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family);
646 extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family, 646 extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
647 __be32 net_spi, __be32 net_seq); 647 __be32 net_spi, __be32 net_seq);
648 extern void xfrm_audit_state_icvfail(struct xfrm_state *x, 648 extern void xfrm_audit_state_icvfail(struct xfrm_state *x,
649 struct sk_buff *skb, u8 proto); 649 struct sk_buff *skb, u8 proto);
650 #else 650 #else
651 #define xfrm_audit_policy_add(x, r, a, se, s) do { ; } while (0) 651
652 #define xfrm_audit_policy_delete(x, r, a, se, s) do { ; } while (0) 652 static inline void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
653 #define xfrm_audit_state_add(x, r, a, se, s) do { ; } while (0) 653 u32 auid, u32 ses, u32 secid)
654 #define xfrm_audit_state_delete(x, r, a, se, s) do { ; } while (0) 654 {
655 #define xfrm_audit_state_replay_overflow(x, s) do { ; } while (0) 655 }
656 #define xfrm_audit_state_notfound_simple(s, f) do { ; } while (0) 656
657 #define xfrm_audit_state_notfound(s, f, sp, sq) do { ; } while (0) 657 static inline void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
658 #define xfrm_audit_state_icvfail(x, s, p) do { ; } while (0) 658 u32 auid, u32 ses, u32 secid)
659 {
660 }
661
662 static inline void xfrm_audit_state_add(struct xfrm_state *x, int result,
663 u32 auid, u32 ses, u32 secid)
664 {
665 }
666
667 static inline void xfrm_audit_state_delete(struct xfrm_state *x, int result,
668 u32 auid, u32 ses, u32 secid)
669 {
670 }
671
672 static inline void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
673 struct sk_buff *skb)
674 {
675 }
676
677 static inline void xfrm_audit_state_notfound_simple(struct sk_buff *skb,
678 u16 family)
679 {
680 }
681
682 static inline void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
683 __be32 net_spi, __be32 net_seq)
684 {
685 }
686
687 static inline void xfrm_audit_state_icvfail(struct xfrm_state *x,
688 struct sk_buff *skb, u8 proto)
689 {
690 }
659 #endif /* CONFIG_AUDITSYSCALL */ 691 #endif /* CONFIG_AUDITSYSCALL */
660 692
661 static inline void xfrm_pol_hold(struct xfrm_policy *policy) 693 static inline void xfrm_pol_hold(struct xfrm_policy *policy)
662 { 694 {
663 if (likely(policy != NULL)) 695 if (likely(policy != NULL))
664 atomic_inc(&policy->refcnt); 696 atomic_inc(&policy->refcnt);
665 } 697 }
666 698
667 extern void xfrm_policy_destroy(struct xfrm_policy *policy); 699 extern void xfrm_policy_destroy(struct xfrm_policy *policy);
668 700
669 static inline void xfrm_pol_put(struct xfrm_policy *policy) 701 static inline void xfrm_pol_put(struct xfrm_policy *policy)
670 { 702 {
671 if (atomic_dec_and_test(&policy->refcnt)) 703 if (atomic_dec_and_test(&policy->refcnt))
672 xfrm_policy_destroy(policy); 704 xfrm_policy_destroy(policy);
673 } 705 }
674 706
675 #ifdef CONFIG_XFRM_SUB_POLICY 707 #ifdef CONFIG_XFRM_SUB_POLICY
676 static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) 708 static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
677 { 709 {
678 int i; 710 int i;
679 for (i = npols - 1; i >= 0; --i) 711 for (i = npols - 1; i >= 0; --i)
680 xfrm_pol_put(pols[i]); 712 xfrm_pol_put(pols[i]);
681 } 713 }
682 #else 714 #else
683 static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols) 715 static inline void xfrm_pols_put(struct xfrm_policy **pols, int npols)
684 { 716 {
685 xfrm_pol_put(pols[0]); 717 xfrm_pol_put(pols[0]);
686 } 718 }
687 #endif 719 #endif
688 720
689 extern void __xfrm_state_destroy(struct xfrm_state *); 721 extern void __xfrm_state_destroy(struct xfrm_state *);
690 722
691 static inline void __xfrm_state_put(struct xfrm_state *x) 723 static inline void __xfrm_state_put(struct xfrm_state *x)
692 { 724 {
693 atomic_dec(&x->refcnt); 725 atomic_dec(&x->refcnt);
694 } 726 }
695 727
696 static inline void xfrm_state_put(struct xfrm_state *x) 728 static inline void xfrm_state_put(struct xfrm_state *x)
697 { 729 {
698 if (atomic_dec_and_test(&x->refcnt)) 730 if (atomic_dec_and_test(&x->refcnt))
699 __xfrm_state_destroy(x); 731 __xfrm_state_destroy(x);
700 } 732 }
701 733
702 static inline void xfrm_state_hold(struct xfrm_state *x) 734 static inline void xfrm_state_hold(struct xfrm_state *x)
703 { 735 {
704 atomic_inc(&x->refcnt); 736 atomic_inc(&x->refcnt);
705 } 737 }
706 738
707 static __inline__ int addr_match(void *token1, void *token2, int prefixlen) 739 static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
708 { 740 {
709 __be32 *a1 = token1; 741 __be32 *a1 = token1;
710 __be32 *a2 = token2; 742 __be32 *a2 = token2;
711 int pdw; 743 int pdw;
712 int pbi; 744 int pbi;
713 745
714 pdw = prefixlen >> 5; /* num of whole __u32 in prefix */ 746 pdw = prefixlen >> 5; /* num of whole __u32 in prefix */
715 pbi = prefixlen & 0x1f; /* num of bits in incomplete u32 in prefix */ 747 pbi = prefixlen & 0x1f; /* num of bits in incomplete u32 in prefix */
716 748
717 if (pdw) 749 if (pdw)
718 if (memcmp(a1, a2, pdw << 2)) 750 if (memcmp(a1, a2, pdw << 2))
719 return 0; 751 return 0;
720 752
721 if (pbi) { 753 if (pbi) {
722 __be32 mask; 754 __be32 mask;
723 755
724 mask = htonl((0xffffffff) << (32 - pbi)); 756 mask = htonl((0xffffffff) << (32 - pbi));
725 757
726 if ((a1[pdw] ^ a2[pdw]) & mask) 758 if ((a1[pdw] ^ a2[pdw]) & mask)
727 return 0; 759 return 0;
728 } 760 }
729 761
730 return 1; 762 return 1;
731 } 763 }
732 764
733 static __inline__ 765 static __inline__
734 __be16 xfrm_flowi_sport(struct flowi *fl) 766 __be16 xfrm_flowi_sport(struct flowi *fl)
735 { 767 {
736 __be16 port; 768 __be16 port;
737 switch(fl->proto) { 769 switch(fl->proto) {
738 case IPPROTO_TCP: 770 case IPPROTO_TCP:
739 case IPPROTO_UDP: 771 case IPPROTO_UDP:
740 case IPPROTO_UDPLITE: 772 case IPPROTO_UDPLITE:
741 case IPPROTO_SCTP: 773 case IPPROTO_SCTP:
742 port = fl->fl_ip_sport; 774 port = fl->fl_ip_sport;
743 break; 775 break;
744 case IPPROTO_ICMP: 776 case IPPROTO_ICMP:
745 case IPPROTO_ICMPV6: 777 case IPPROTO_ICMPV6:
746 port = htons(fl->fl_icmp_type); 778 port = htons(fl->fl_icmp_type);
747 break; 779 break;
748 case IPPROTO_MH: 780 case IPPROTO_MH:
749 port = htons(fl->fl_mh_type); 781 port = htons(fl->fl_mh_type);
750 break; 782 break;
751 default: 783 default:
752 port = 0; /*XXX*/ 784 port = 0; /*XXX*/
753 } 785 }
754 return port; 786 return port;
755 } 787 }
756 788
757 static __inline__ 789 static __inline__
758 __be16 xfrm_flowi_dport(struct flowi *fl) 790 __be16 xfrm_flowi_dport(struct flowi *fl)
759 { 791 {
760 __be16 port; 792 __be16 port;
761 switch(fl->proto) { 793 switch(fl->proto) {
762 case IPPROTO_TCP: 794 case IPPROTO_TCP:
763 case IPPROTO_UDP: 795 case IPPROTO_UDP:
764 case IPPROTO_UDPLITE: 796 case IPPROTO_UDPLITE:
765 case IPPROTO_SCTP: 797 case IPPROTO_SCTP:
766 port = fl->fl_ip_dport; 798 port = fl->fl_ip_dport;
767 break; 799 break;
768 case IPPROTO_ICMP: 800 case IPPROTO_ICMP:
769 case IPPROTO_ICMPV6: 801 case IPPROTO_ICMPV6:
770 port = htons(fl->fl_icmp_code); 802 port = htons(fl->fl_icmp_code);
771 break; 803 break;
772 default: 804 default:
773 port = 0; /*XXX*/ 805 port = 0; /*XXX*/
774 } 806 }
775 return port; 807 return port;
776 } 808 }
777 809
778 extern int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl, 810 extern int xfrm_selector_match(struct xfrm_selector *sel, struct flowi *fl,
779 unsigned short family); 811 unsigned short family);
780 812
781 #ifdef CONFIG_SECURITY_NETWORK_XFRM 813 #ifdef CONFIG_SECURITY_NETWORK_XFRM
782 /* If neither has a context --> match 814 /* If neither has a context --> match
783 * Otherwise, both must have a context and the sids, doi, alg must match 815 * Otherwise, both must have a context and the sids, doi, alg must match
784 */ 816 */
785 static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2) 817 static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
786 { 818 {
787 return ((!s1 && !s2) || 819 return ((!s1 && !s2) ||
788 (s1 && s2 && 820 (s1 && s2 &&
789 (s1->ctx_sid == s2->ctx_sid) && 821 (s1->ctx_sid == s2->ctx_sid) &&
790 (s1->ctx_doi == s2->ctx_doi) && 822 (s1->ctx_doi == s2->ctx_doi) &&
791 (s1->ctx_alg == s2->ctx_alg))); 823 (s1->ctx_alg == s2->ctx_alg)));
792 } 824 }
793 #else 825 #else
794 static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2) 826 static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
795 { 827 {
796 return 1; 828 return 1;
797 } 829 }
798 #endif 830 #endif
799 831
800 /* A struct encoding bundle of transformations to apply to some set of flow. 832 /* A struct encoding bundle of transformations to apply to some set of flow.
801 * 833 *
802 * dst->child points to the next element of bundle. 834 * dst->child points to the next element of bundle.
803 * dst->xfrm points to an instanse of transformer. 835 * dst->xfrm points to an instanse of transformer.
804 * 836 *
805 * Due to unfortunate limitations of current routing cache, which we 837 * Due to unfortunate limitations of current routing cache, which we
806 * have no time to fix, it mirrors struct rtable and bound to the same 838 * have no time to fix, it mirrors struct rtable and bound to the same
807 * routing key, including saddr,daddr. However, we can have many of 839 * routing key, including saddr,daddr. However, we can have many of
808 * bundles differing by session id. All the bundles grow from a parent 840 * bundles differing by session id. All the bundles grow from a parent
809 * policy rule. 841 * policy rule.
810 */ 842 */
811 struct xfrm_dst 843 struct xfrm_dst
812 { 844 {
813 union { 845 union {
814 struct dst_entry dst; 846 struct dst_entry dst;
815 struct rtable rt; 847 struct rtable rt;
816 struct rt6_info rt6; 848 struct rt6_info rt6;
817 } u; 849 } u;
818 struct dst_entry *route; 850 struct dst_entry *route;
819 #ifdef CONFIG_XFRM_SUB_POLICY 851 #ifdef CONFIG_XFRM_SUB_POLICY
820 struct flowi *origin; 852 struct flowi *origin;
821 struct xfrm_selector *partner; 853 struct xfrm_selector *partner;
822 #endif 854 #endif
823 u32 genid; 855 u32 genid;
824 u32 route_mtu_cached; 856 u32 route_mtu_cached;
825 u32 child_mtu_cached; 857 u32 child_mtu_cached;
826 u32 route_cookie; 858 u32 route_cookie;
827 u32 path_cookie; 859 u32 path_cookie;
828 }; 860 };
829 861
830 static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) 862 static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
831 { 863 {
832 dst_release(xdst->route); 864 dst_release(xdst->route);
833 if (likely(xdst->u.dst.xfrm)) 865 if (likely(xdst->u.dst.xfrm))
834 xfrm_state_put(xdst->u.dst.xfrm); 866 xfrm_state_put(xdst->u.dst.xfrm);
835 #ifdef CONFIG_XFRM_SUB_POLICY 867 #ifdef CONFIG_XFRM_SUB_POLICY
836 kfree(xdst->origin); 868 kfree(xdst->origin);
837 xdst->origin = NULL; 869 xdst->origin = NULL;
838 kfree(xdst->partner); 870 kfree(xdst->partner);
839 xdst->partner = NULL; 871 xdst->partner = NULL;
840 #endif 872 #endif
841 } 873 }
842 874
843 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); 875 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
844 876
845 struct sec_path 877 struct sec_path
846 { 878 {
847 atomic_t refcnt; 879 atomic_t refcnt;
848 int len; 880 int len;
849 struct xfrm_state *xvec[XFRM_MAX_DEPTH]; 881 struct xfrm_state *xvec[XFRM_MAX_DEPTH];
850 }; 882 };
851 883
852 static inline struct sec_path * 884 static inline struct sec_path *
853 secpath_get(struct sec_path *sp) 885 secpath_get(struct sec_path *sp)
854 { 886 {
855 if (sp) 887 if (sp)
856 atomic_inc(&sp->refcnt); 888 atomic_inc(&sp->refcnt);
857 return sp; 889 return sp;
858 } 890 }
859 891
860 extern void __secpath_destroy(struct sec_path *sp); 892 extern void __secpath_destroy(struct sec_path *sp);
861 893
862 static inline void 894 static inline void
863 secpath_put(struct sec_path *sp) 895 secpath_put(struct sec_path *sp)
864 { 896 {
865 if (sp && atomic_dec_and_test(&sp->refcnt)) 897 if (sp && atomic_dec_and_test(&sp->refcnt))
866 __secpath_destroy(sp); 898 __secpath_destroy(sp);
867 } 899 }
868 900
869 extern struct sec_path *secpath_dup(struct sec_path *src); 901 extern struct sec_path *secpath_dup(struct sec_path *src);
870 902
871 static inline void 903 static inline void
872 secpath_reset(struct sk_buff *skb) 904 secpath_reset(struct sk_buff *skb)
873 { 905 {
874 #ifdef CONFIG_XFRM 906 #ifdef CONFIG_XFRM
875 secpath_put(skb->sp); 907 secpath_put(skb->sp);
876 skb->sp = NULL; 908 skb->sp = NULL;
877 #endif 909 #endif
878 } 910 }
879 911
880 static inline int 912 static inline int
881 xfrm_addr_any(xfrm_address_t *addr, unsigned short family) 913 xfrm_addr_any(xfrm_address_t *addr, unsigned short family)
882 { 914 {
883 switch (family) { 915 switch (family) {
884 case AF_INET: 916 case AF_INET:
885 return addr->a4 == 0; 917 return addr->a4 == 0;
886 case AF_INET6: 918 case AF_INET6:
887 return ipv6_addr_any((struct in6_addr *)&addr->a6); 919 return ipv6_addr_any((struct in6_addr *)&addr->a6);
888 } 920 }
889 return 0; 921 return 0;
890 } 922 }
891 923
892 static inline int 924 static inline int
893 __xfrm4_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x) 925 __xfrm4_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x)
894 { 926 {
895 return (tmpl->saddr.a4 && 927 return (tmpl->saddr.a4 &&
896 tmpl->saddr.a4 != x->props.saddr.a4); 928 tmpl->saddr.a4 != x->props.saddr.a4);
897 } 929 }
898 930
899 static inline int 931 static inline int
900 __xfrm6_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x) 932 __xfrm6_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x)
901 { 933 {
902 return (!ipv6_addr_any((struct in6_addr*)&tmpl->saddr) && 934 return (!ipv6_addr_any((struct in6_addr*)&tmpl->saddr) &&
903 ipv6_addr_cmp((struct in6_addr *)&tmpl->saddr, (struct in6_addr*)&x->props.saddr)); 935 ipv6_addr_cmp((struct in6_addr *)&tmpl->saddr, (struct in6_addr*)&x->props.saddr));
904 } 936 }
905 937
906 static inline int 938 static inline int
907 xfrm_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x, unsigned short family) 939 xfrm_state_addr_cmp(struct xfrm_tmpl *tmpl, struct xfrm_state *x, unsigned short family)
908 { 940 {
909 switch (family) { 941 switch (family) {
910 case AF_INET: 942 case AF_INET:
911 return __xfrm4_state_addr_cmp(tmpl, x); 943 return __xfrm4_state_addr_cmp(tmpl, x);
912 case AF_INET6: 944 case AF_INET6:
913 return __xfrm6_state_addr_cmp(tmpl, x); 945 return __xfrm6_state_addr_cmp(tmpl, x);
914 } 946 }
915 return !0; 947 return !0;
916 } 948 }
917 949
918 #ifdef CONFIG_XFRM 950 #ifdef CONFIG_XFRM
919 extern int __xfrm_policy_check(struct sock *, int dir, struct sk_buff *skb, unsigned short family); 951 extern int __xfrm_policy_check(struct sock *, int dir, struct sk_buff *skb, unsigned short family);
920 952
921 static inline int __xfrm_policy_check2(struct sock *sk, int dir, 953 static inline int __xfrm_policy_check2(struct sock *sk, int dir,
922 struct sk_buff *skb, 954 struct sk_buff *skb,
923 unsigned int family, int reverse) 955 unsigned int family, int reverse)
924 { 956 {
925 int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0); 957 int ndir = dir | (reverse ? XFRM_POLICY_MASK + 1 : 0);
926 958
927 if (sk && sk->sk_policy[XFRM_POLICY_IN]) 959 if (sk && sk->sk_policy[XFRM_POLICY_IN])
928 return __xfrm_policy_check(sk, ndir, skb, family); 960 return __xfrm_policy_check(sk, ndir, skb, family);
929 961
930 return (!xfrm_policy_count[dir] && !skb->sp) || 962 return (!xfrm_policy_count[dir] && !skb->sp) ||
931 (skb->dst->flags & DST_NOPOLICY) || 963 (skb->dst->flags & DST_NOPOLICY) ||
932 __xfrm_policy_check(sk, ndir, skb, family); 964 __xfrm_policy_check(sk, ndir, skb, family);
933 } 965 }
934 966
935 static inline int xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, unsigned short family) 967 static inline int xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, unsigned short family)
936 { 968 {
937 return __xfrm_policy_check2(sk, dir, skb, family, 0); 969 return __xfrm_policy_check2(sk, dir, skb, family, 0);
938 } 970 }
939 971
940 static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb) 972 static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
941 { 973 {
942 return xfrm_policy_check(sk, dir, skb, AF_INET); 974 return xfrm_policy_check(sk, dir, skb, AF_INET);
943 } 975 }
944 976
945 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb) 977 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
946 { 978 {
947 return xfrm_policy_check(sk, dir, skb, AF_INET6); 979 return xfrm_policy_check(sk, dir, skb, AF_INET6);
948 } 980 }
949 981
950 static inline int xfrm4_policy_check_reverse(struct sock *sk, int dir, 982 static inline int xfrm4_policy_check_reverse(struct sock *sk, int dir,
951 struct sk_buff *skb) 983 struct sk_buff *skb)
952 { 984 {
953 return __xfrm_policy_check2(sk, dir, skb, AF_INET, 1); 985 return __xfrm_policy_check2(sk, dir, skb, AF_INET, 1);
954 } 986 }
955 987
956 static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir, 988 static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
957 struct sk_buff *skb) 989 struct sk_buff *skb)
958 { 990 {
959 return __xfrm_policy_check2(sk, dir, skb, AF_INET6, 1); 991 return __xfrm_policy_check2(sk, dir, skb, AF_INET6, 1);
960 } 992 }
961 993
962 extern int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, 994 extern int __xfrm_decode_session(struct sk_buff *skb, struct flowi *fl,
963 unsigned int family, int reverse); 995 unsigned int family, int reverse);
964 996
965 static inline int xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, 997 static inline int xfrm_decode_session(struct sk_buff *skb, struct flowi *fl,
966 unsigned int family) 998 unsigned int family)
967 { 999 {
968 return __xfrm_decode_session(skb, fl, family, 0); 1000 return __xfrm_decode_session(skb, fl, family, 0);
969 } 1001 }
970 1002
971 static inline int xfrm_decode_session_reverse(struct sk_buff *skb, 1003 static inline int xfrm_decode_session_reverse(struct sk_buff *skb,
972 struct flowi *fl, 1004 struct flowi *fl,
973 unsigned int family) 1005 unsigned int family)
974 { 1006 {
975 return __xfrm_decode_session(skb, fl, family, 1); 1007 return __xfrm_decode_session(skb, fl, family, 1);
976 } 1008 }
977 1009
978 extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family); 1010 extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family);
979 1011
980 static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family) 1012 static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
981 { 1013 {
982 return !xfrm_policy_count[XFRM_POLICY_OUT] || 1014 return !xfrm_policy_count[XFRM_POLICY_OUT] ||
983 (skb->dst->flags & DST_NOXFRM) || 1015 (skb->dst->flags & DST_NOXFRM) ||
984 __xfrm_route_forward(skb, family); 1016 __xfrm_route_forward(skb, family);
985 } 1017 }
986 1018
987 static inline int xfrm4_route_forward(struct sk_buff *skb) 1019 static inline int xfrm4_route_forward(struct sk_buff *skb)
988 { 1020 {
989 return xfrm_route_forward(skb, AF_INET); 1021 return xfrm_route_forward(skb, AF_INET);
990 } 1022 }
991 1023
992 static inline int xfrm6_route_forward(struct sk_buff *skb) 1024 static inline int xfrm6_route_forward(struct sk_buff *skb)
993 { 1025 {
994 return xfrm_route_forward(skb, AF_INET6); 1026 return xfrm_route_forward(skb, AF_INET6);
995 } 1027 }
996 1028
997 extern int __xfrm_sk_clone_policy(struct sock *sk); 1029 extern int __xfrm_sk_clone_policy(struct sock *sk);
998 1030
999 static inline int xfrm_sk_clone_policy(struct sock *sk) 1031 static inline int xfrm_sk_clone_policy(struct sock *sk)
1000 { 1032 {
1001 if (unlikely(sk->sk_policy[0] || sk->sk_policy[1])) 1033 if (unlikely(sk->sk_policy[0] || sk->sk_policy[1]))
1002 return __xfrm_sk_clone_policy(sk); 1034 return __xfrm_sk_clone_policy(sk);
1003 return 0; 1035 return 0;
1004 } 1036 }
1005 1037
1006 extern int xfrm_policy_delete(struct xfrm_policy *pol, int dir); 1038 extern int xfrm_policy_delete(struct xfrm_policy *pol, int dir);
1007 1039
1008 static inline void xfrm_sk_free_policy(struct sock *sk) 1040 static inline void xfrm_sk_free_policy(struct sock *sk)
1009 { 1041 {
1010 if (unlikely(sk->sk_policy[0] != NULL)) { 1042 if (unlikely(sk->sk_policy[0] != NULL)) {
1011 xfrm_policy_delete(sk->sk_policy[0], XFRM_POLICY_MAX); 1043 xfrm_policy_delete(sk->sk_policy[0], XFRM_POLICY_MAX);
1012 sk->sk_policy[0] = NULL; 1044 sk->sk_policy[0] = NULL;
1013 } 1045 }
1014 if (unlikely(sk->sk_policy[1] != NULL)) { 1046 if (unlikely(sk->sk_policy[1] != NULL)) {
1015 xfrm_policy_delete(sk->sk_policy[1], XFRM_POLICY_MAX+1); 1047 xfrm_policy_delete(sk->sk_policy[1], XFRM_POLICY_MAX+1);
1016 sk->sk_policy[1] = NULL; 1048 sk->sk_policy[1] = NULL;
1017 } 1049 }
1018 } 1050 }
1019 1051
1020 #else 1052 #else
1021 1053
1022 static inline void xfrm_sk_free_policy(struct sock *sk) {} 1054 static inline void xfrm_sk_free_policy(struct sock *sk) {}
1023 static inline int xfrm_sk_clone_policy(struct sock *sk) { return 0; } 1055 static inline int xfrm_sk_clone_policy(struct sock *sk) { return 0; }
1024 static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; } 1056 static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; }
1025 static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; } 1057 static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; }
1026 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb) 1058 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
1027 { 1059 {
1028 return 1; 1060 return 1;
1029 } 1061 }
1030 static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb) 1062 static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
1031 { 1063 {
1032 return 1; 1064 return 1;
1033 } 1065 }
1034 static inline int xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, unsigned short family) 1066 static inline int xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, unsigned short family)
1035 { 1067 {
1036 return 1; 1068 return 1;
1037 } 1069 }
1038 static inline int xfrm_decode_session_reverse(struct sk_buff *skb, 1070 static inline int xfrm_decode_session_reverse(struct sk_buff *skb,
1039 struct flowi *fl, 1071 struct flowi *fl,
1040 unsigned int family) 1072 unsigned int family)
1041 { 1073 {
1042 return -ENOSYS; 1074 return -ENOSYS;
1043 } 1075 }
1044 static inline int xfrm4_policy_check_reverse(struct sock *sk, int dir, 1076 static inline int xfrm4_policy_check_reverse(struct sock *sk, int dir,
1045 struct sk_buff *skb) 1077 struct sk_buff *skb)
1046 { 1078 {
1047 return 1; 1079 return 1;
1048 } 1080 }
1049 static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir, 1081 static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
1050 struct sk_buff *skb) 1082 struct sk_buff *skb)
1051 { 1083 {
1052 return 1; 1084 return 1;
1053 } 1085 }
1054 #endif 1086 #endif
1055 1087
1056 static __inline__ 1088 static __inline__
1057 xfrm_address_t *xfrm_flowi_daddr(struct flowi *fl, unsigned short family) 1089 xfrm_address_t *xfrm_flowi_daddr(struct flowi *fl, unsigned short family)
1058 { 1090 {
1059 switch (family){ 1091 switch (family){
1060 case AF_INET: 1092 case AF_INET:
1061 return (xfrm_address_t *)&fl->fl4_dst; 1093 return (xfrm_address_t *)&fl->fl4_dst;
1062 case AF_INET6: 1094 case AF_INET6:
1063 return (xfrm_address_t *)&fl->fl6_dst; 1095 return (xfrm_address_t *)&fl->fl6_dst;
1064 } 1096 }
1065 return NULL; 1097 return NULL;
1066 } 1098 }
1067 1099
1068 static __inline__ 1100 static __inline__
1069 xfrm_address_t *xfrm_flowi_saddr(struct flowi *fl, unsigned short family) 1101 xfrm_address_t *xfrm_flowi_saddr(struct flowi *fl, unsigned short family)
1070 { 1102 {
1071 switch (family){ 1103 switch (family){
1072 case AF_INET: 1104 case AF_INET:
1073 return (xfrm_address_t *)&fl->fl4_src; 1105 return (xfrm_address_t *)&fl->fl4_src;
1074 case AF_INET6: 1106 case AF_INET6:
1075 return (xfrm_address_t *)&fl->fl6_src; 1107 return (xfrm_address_t *)&fl->fl6_src;
1076 } 1108 }
1077 return NULL; 1109 return NULL;
1078 } 1110 }
1079 1111
1080 static __inline__ 1112 static __inline__
1081 void xfrm_flowi_addr_get(struct flowi *fl, 1113 void xfrm_flowi_addr_get(struct flowi *fl,
1082 xfrm_address_t *saddr, xfrm_address_t *daddr, 1114 xfrm_address_t *saddr, xfrm_address_t *daddr,
1083 unsigned short family) 1115 unsigned short family)
1084 { 1116 {
1085 switch(family) { 1117 switch(family) {
1086 case AF_INET: 1118 case AF_INET:
1087 memcpy(&saddr->a4, &fl->fl4_src, sizeof(saddr->a4)); 1119 memcpy(&saddr->a4, &fl->fl4_src, sizeof(saddr->a4));
1088 memcpy(&daddr->a4, &fl->fl4_dst, sizeof(daddr->a4)); 1120 memcpy(&daddr->a4, &fl->fl4_dst, sizeof(daddr->a4));
1089 break; 1121 break;
1090 case AF_INET6: 1122 case AF_INET6:
1091 ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->fl6_src); 1123 ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->fl6_src);
1092 ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->fl6_dst); 1124 ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->fl6_dst);
1093 break; 1125 break;
1094 } 1126 }
1095 } 1127 }
1096 1128
1097 static __inline__ int 1129 static __inline__ int
1098 __xfrm4_state_addr_check(struct xfrm_state *x, 1130 __xfrm4_state_addr_check(struct xfrm_state *x,
1099 xfrm_address_t *daddr, xfrm_address_t *saddr) 1131 xfrm_address_t *daddr, xfrm_address_t *saddr)
1100 { 1132 {
1101 if (daddr->a4 == x->id.daddr.a4 && 1133 if (daddr->a4 == x->id.daddr.a4 &&
1102 (saddr->a4 == x->props.saddr.a4 || !saddr->a4 || !x->props.saddr.a4)) 1134 (saddr->a4 == x->props.saddr.a4 || !saddr->a4 || !x->props.saddr.a4))
1103 return 1; 1135 return 1;
1104 return 0; 1136 return 0;
1105 } 1137 }
1106 1138
1107 static __inline__ int 1139 static __inline__ int
1108 __xfrm6_state_addr_check(struct xfrm_state *x, 1140 __xfrm6_state_addr_check(struct xfrm_state *x,
1109 xfrm_address_t *daddr, xfrm_address_t *saddr) 1141 xfrm_address_t *daddr, xfrm_address_t *saddr)
1110 { 1142 {
1111 if (!ipv6_addr_cmp((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) && 1143 if (!ipv6_addr_cmp((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) &&
1112 (!ipv6_addr_cmp((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr)|| 1144 (!ipv6_addr_cmp((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr)||
1113 ipv6_addr_any((struct in6_addr *)saddr) || 1145 ipv6_addr_any((struct in6_addr *)saddr) ||
1114 ipv6_addr_any((struct in6_addr *)&x->props.saddr))) 1146 ipv6_addr_any((struct in6_addr *)&x->props.saddr)))
1115 return 1; 1147 return 1;
1116 return 0; 1148 return 0;
1117 } 1149 }
1118 1150
1119 static __inline__ int 1151 static __inline__ int
1120 xfrm_state_addr_check(struct xfrm_state *x, 1152 xfrm_state_addr_check(struct xfrm_state *x,
1121 xfrm_address_t *daddr, xfrm_address_t *saddr, 1153 xfrm_address_t *daddr, xfrm_address_t *saddr,
1122 unsigned short family) 1154 unsigned short family)
1123 { 1155 {
1124 switch (family) { 1156 switch (family) {
1125 case AF_INET: 1157 case AF_INET:
1126 return __xfrm4_state_addr_check(x, daddr, saddr); 1158 return __xfrm4_state_addr_check(x, daddr, saddr);
1127 case AF_INET6: 1159 case AF_INET6:
1128 return __xfrm6_state_addr_check(x, daddr, saddr); 1160 return __xfrm6_state_addr_check(x, daddr, saddr);
1129 } 1161 }
1130 return 0; 1162 return 0;
1131 } 1163 }
1132 1164
1133 static __inline__ int 1165 static __inline__ int
1134 xfrm_state_addr_flow_check(struct xfrm_state *x, struct flowi *fl, 1166 xfrm_state_addr_flow_check(struct xfrm_state *x, struct flowi *fl,
1135 unsigned short family) 1167 unsigned short family)
1136 { 1168 {
1137 switch (family) { 1169 switch (family) {
1138 case AF_INET: 1170 case AF_INET:
1139 return __xfrm4_state_addr_check(x, 1171 return __xfrm4_state_addr_check(x,
1140 (xfrm_address_t *)&fl->fl4_dst, 1172 (xfrm_address_t *)&fl->fl4_dst,
1141 (xfrm_address_t *)&fl->fl4_src); 1173 (xfrm_address_t *)&fl->fl4_src);
1142 case AF_INET6: 1174 case AF_INET6:
1143 return __xfrm6_state_addr_check(x, 1175 return __xfrm6_state_addr_check(x,
1144 (xfrm_address_t *)&fl->fl6_dst, 1176 (xfrm_address_t *)&fl->fl6_dst,
1145 (xfrm_address_t *)&fl->fl6_src); 1177 (xfrm_address_t *)&fl->fl6_src);
1146 } 1178 }
1147 return 0; 1179 return 0;
1148 } 1180 }
1149 1181
1150 static inline int xfrm_state_kern(struct xfrm_state *x) 1182 static inline int xfrm_state_kern(struct xfrm_state *x)
1151 { 1183 {
1152 return atomic_read(&x->tunnel_users); 1184 return atomic_read(&x->tunnel_users);
1153 } 1185 }
1154 1186
1155 static inline int xfrm_id_proto_match(u8 proto, u8 userproto) 1187 static inline int xfrm_id_proto_match(u8 proto, u8 userproto)
1156 { 1188 {
1157 return (!userproto || proto == userproto || 1189 return (!userproto || proto == userproto ||
1158 (userproto == IPSEC_PROTO_ANY && (proto == IPPROTO_AH || 1190 (userproto == IPSEC_PROTO_ANY && (proto == IPPROTO_AH ||
1159 proto == IPPROTO_ESP || 1191 proto == IPPROTO_ESP ||
1160 proto == IPPROTO_COMP))); 1192 proto == IPPROTO_COMP)));
1161 } 1193 }
1162 1194
1163 /* 1195 /*
1164 * xfrm algorithm information 1196 * xfrm algorithm information
1165 */ 1197 */
1166 struct xfrm_algo_aead_info { 1198 struct xfrm_algo_aead_info {
1167 u16 icv_truncbits; 1199 u16 icv_truncbits;
1168 }; 1200 };
1169 1201
1170 struct xfrm_algo_auth_info { 1202 struct xfrm_algo_auth_info {
1171 u16 icv_truncbits; 1203 u16 icv_truncbits;
1172 u16 icv_fullbits; 1204 u16 icv_fullbits;
1173 }; 1205 };
1174 1206
1175 struct xfrm_algo_encr_info { 1207 struct xfrm_algo_encr_info {
1176 u16 blockbits; 1208 u16 blockbits;
1177 u16 defkeybits; 1209 u16 defkeybits;
1178 }; 1210 };
1179 1211
1180 struct xfrm_algo_comp_info { 1212 struct xfrm_algo_comp_info {
1181 u16 threshold; 1213 u16 threshold;
1182 }; 1214 };
1183 1215
1184 struct xfrm_algo_desc { 1216 struct xfrm_algo_desc {
1185 char *name; 1217 char *name;
1186 char *compat; 1218 char *compat;
1187 u8 available:1; 1219 u8 available:1;
1188 union { 1220 union {
1189 struct xfrm_algo_aead_info aead; 1221 struct xfrm_algo_aead_info aead;
1190 struct xfrm_algo_auth_info auth; 1222 struct xfrm_algo_auth_info auth;
1191 struct xfrm_algo_encr_info encr; 1223 struct xfrm_algo_encr_info encr;
1192 struct xfrm_algo_comp_info comp; 1224 struct xfrm_algo_comp_info comp;
1193 } uinfo; 1225 } uinfo;
1194 struct sadb_alg desc; 1226 struct sadb_alg desc;
1195 }; 1227 };
1196 1228
1197 /* XFRM tunnel handlers. */ 1229 /* XFRM tunnel handlers. */
1198 struct xfrm_tunnel { 1230 struct xfrm_tunnel {
1199 int (*handler)(struct sk_buff *skb); 1231 int (*handler)(struct sk_buff *skb);
1200 int (*err_handler)(struct sk_buff *skb, __u32 info); 1232 int (*err_handler)(struct sk_buff *skb, __u32 info);
1201 1233
1202 struct xfrm_tunnel *next; 1234 struct xfrm_tunnel *next;
1203 int priority; 1235 int priority;
1204 }; 1236 };
1205 1237
1206 struct xfrm6_tunnel { 1238 struct xfrm6_tunnel {
1207 int (*handler)(struct sk_buff *skb); 1239 int (*handler)(struct sk_buff *skb);
1208 int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt, 1240 int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,
1209 int type, int code, int offset, __be32 info); 1241 int type, int code, int offset, __be32 info);
1210 struct xfrm6_tunnel *next; 1242 struct xfrm6_tunnel *next;
1211 int priority; 1243 int priority;
1212 }; 1244 };
1213 1245
1214 struct xfrm_state_walk { 1246 struct xfrm_state_walk {
1215 struct xfrm_state *state; 1247 struct xfrm_state *state;
1216 int count; 1248 int count;
1217 u8 proto; 1249 u8 proto;
1218 }; 1250 };
1219 1251
1220 struct xfrm_policy_walk { 1252 struct xfrm_policy_walk {
1221 struct xfrm_policy *policy; 1253 struct xfrm_policy *policy;
1222 int count; 1254 int count;
1223 u8 type, cur_type; 1255 u8 type, cur_type;
1224 }; 1256 };
1225 1257
1226 extern void xfrm_init(void); 1258 extern void xfrm_init(void);
1227 extern void xfrm4_init(void); 1259 extern void xfrm4_init(void);
1228 extern void xfrm_state_init(void); 1260 extern void xfrm_state_init(void);
1229 extern void xfrm4_state_init(void); 1261 extern void xfrm4_state_init(void);
1230 #ifdef CONFIG_XFRM 1262 #ifdef CONFIG_XFRM
1231 extern int xfrm6_init(void); 1263 extern int xfrm6_init(void);
1232 extern void xfrm6_fini(void); 1264 extern void xfrm6_fini(void);
1233 extern int xfrm6_state_init(void); 1265 extern int xfrm6_state_init(void);
1234 extern void xfrm6_state_fini(void); 1266 extern void xfrm6_state_fini(void);
1235 #else 1267 #else
1236 static inline int xfrm6_init(void) 1268 static inline int xfrm6_init(void)
1237 { 1269 {
1238 return 0; 1270 return 0;
1239 } 1271 }
1240 static inline void xfrm6_fini(void) 1272 static inline void xfrm6_fini(void)
1241 { 1273 {
1242 ; 1274 ;
1243 } 1275 }
1244 #endif 1276 #endif
1245 1277
1246 #ifdef CONFIG_XFRM_STATISTICS 1278 #ifdef CONFIG_XFRM_STATISTICS
1247 extern int xfrm_proc_init(void); 1279 extern int xfrm_proc_init(void);
1248 #endif 1280 #endif
1249 1281
1250 static inline void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto) 1282 static inline void xfrm_state_walk_init(struct xfrm_state_walk *walk, u8 proto)
1251 { 1283 {
1252 walk->proto = proto; 1284 walk->proto = proto;
1253 walk->state = NULL; 1285 walk->state = NULL;
1254 walk->count = 0; 1286 walk->count = 0;
1255 } 1287 }
1256 1288
1257 static inline void xfrm_state_walk_done(struct xfrm_state_walk *walk) 1289 static inline void xfrm_state_walk_done(struct xfrm_state_walk *walk)
1258 { 1290 {
1259 if (walk->state != NULL) { 1291 if (walk->state != NULL) {
1260 xfrm_state_put(walk->state); 1292 xfrm_state_put(walk->state);
1261 walk->state = NULL; 1293 walk->state = NULL;
1262 } 1294 }
1263 } 1295 }
1264 1296
1265 extern int xfrm_state_walk(struct xfrm_state_walk *walk, 1297 extern int xfrm_state_walk(struct xfrm_state_walk *walk,
1266 int (*func)(struct xfrm_state *, int, void*), void *); 1298 int (*func)(struct xfrm_state *, int, void*), void *);
1267 extern struct xfrm_state *xfrm_state_alloc(void); 1299 extern struct xfrm_state *xfrm_state_alloc(void);
1268 extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 1300 extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr,
1269 struct flowi *fl, struct xfrm_tmpl *tmpl, 1301 struct flowi *fl, struct xfrm_tmpl *tmpl,
1270 struct xfrm_policy *pol, int *err, 1302 struct xfrm_policy *pol, int *err,
1271 unsigned short family); 1303 unsigned short family);
1272 extern struct xfrm_state * xfrm_stateonly_find(xfrm_address_t *daddr, 1304 extern struct xfrm_state * xfrm_stateonly_find(xfrm_address_t *daddr,
1273 xfrm_address_t *saddr, 1305 xfrm_address_t *saddr,
1274 unsigned short family, 1306 unsigned short family,
1275 u8 mode, u8 proto, u32 reqid); 1307 u8 mode, u8 proto, u32 reqid);
1276 extern int xfrm_state_check_expire(struct xfrm_state *x); 1308 extern int xfrm_state_check_expire(struct xfrm_state *x);
1277 extern void xfrm_state_insert(struct xfrm_state *x); 1309 extern void xfrm_state_insert(struct xfrm_state *x);
1278 extern int xfrm_state_add(struct xfrm_state *x); 1310 extern int xfrm_state_add(struct xfrm_state *x);
1279 extern int xfrm_state_update(struct xfrm_state *x); 1311 extern int xfrm_state_update(struct xfrm_state *x);
1280 extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family); 1312 extern struct xfrm_state *xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto, unsigned short family);
1281 extern struct xfrm_state *xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family); 1313 extern struct xfrm_state *xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto, unsigned short family);
1282 #ifdef CONFIG_XFRM_SUB_POLICY 1314 #ifdef CONFIG_XFRM_SUB_POLICY
1283 extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, 1315 extern int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
1284 int n, unsigned short family); 1316 int n, unsigned short family);
1285 extern int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src, 1317 extern int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src,
1286 int n, unsigned short family); 1318 int n, unsigned short family);
1287 #else 1319 #else
1288 static inline int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, 1320 static inline int xfrm_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src,
1289 int n, unsigned short family) 1321 int n, unsigned short family)
1290 { 1322 {
1291 return -ENOSYS; 1323 return -ENOSYS;
1292 } 1324 }
1293 1325
1294 static inline int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src, 1326 static inline int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **src,
1295 int n, unsigned short family) 1327 int n, unsigned short family)
1296 { 1328 {
1297 return -ENOSYS; 1329 return -ENOSYS;
1298 } 1330 }
1299 #endif 1331 #endif
1300 1332
1301 struct xfrmk_sadinfo { 1333 struct xfrmk_sadinfo {
1302 u32 sadhcnt; /* current hash bkts */ 1334 u32 sadhcnt; /* current hash bkts */
1303 u32 sadhmcnt; /* max allowed hash bkts */ 1335 u32 sadhmcnt; /* max allowed hash bkts */
1304 u32 sadcnt; /* current running count */ 1336 u32 sadcnt; /* current running count */
1305 }; 1337 };
1306 1338
1307 struct xfrmk_spdinfo { 1339 struct xfrmk_spdinfo {
1308 u32 incnt; 1340 u32 incnt;
1309 u32 outcnt; 1341 u32 outcnt;
1310 u32 fwdcnt; 1342 u32 fwdcnt;
1311 u32 inscnt; 1343 u32 inscnt;
1312 u32 outscnt; 1344 u32 outscnt;
1313 u32 fwdscnt; 1345 u32 fwdscnt;
1314 u32 spdhcnt; 1346 u32 spdhcnt;
1315 u32 spdhmcnt; 1347 u32 spdhmcnt;
1316 }; 1348 };
1317 1349
1318 extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq); 1350 extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
1319 extern int xfrm_state_delete(struct xfrm_state *x); 1351 extern int xfrm_state_delete(struct xfrm_state *x);
1320 extern int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info); 1352 extern int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);
1321 extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si); 1353 extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
1322 extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si); 1354 extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si);
1323 extern int xfrm_replay_check(struct xfrm_state *x, 1355 extern int xfrm_replay_check(struct xfrm_state *x,
1324 struct sk_buff *skb, __be32 seq); 1356 struct sk_buff *skb, __be32 seq);
1325 extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq); 1357 extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);
1326 extern void xfrm_replay_notify(struct xfrm_state *x, int event); 1358 extern void xfrm_replay_notify(struct xfrm_state *x, int event);
1327 extern int xfrm_state_mtu(struct xfrm_state *x, int mtu); 1359 extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);
1328 extern int xfrm_init_state(struct xfrm_state *x); 1360 extern int xfrm_init_state(struct xfrm_state *x);
1329 extern int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb); 1361 extern int xfrm_prepare_input(struct xfrm_state *x, struct sk_buff *skb);
1330 extern int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi, 1362 extern int xfrm_input(struct sk_buff *skb, int nexthdr, __be32 spi,
1331 int encap_type); 1363 int encap_type);
1332 extern int xfrm_input_resume(struct sk_buff *skb, int nexthdr); 1364 extern int xfrm_input_resume(struct sk_buff *skb, int nexthdr);
1333 extern int xfrm_output_resume(struct sk_buff *skb, int err); 1365 extern int xfrm_output_resume(struct sk_buff *skb, int err);
1334 extern int xfrm_output(struct sk_buff *skb); 1366 extern int xfrm_output(struct sk_buff *skb);
1335 extern int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb); 1367 extern int xfrm_inner_extract_output(struct xfrm_state *x, struct sk_buff *skb);
1336 extern int xfrm4_extract_header(struct sk_buff *skb); 1368 extern int xfrm4_extract_header(struct sk_buff *skb);
1337 extern int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb); 1369 extern int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb);
1338 extern int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, 1370 extern int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
1339 int encap_type); 1371 int encap_type);
1340 extern int xfrm4_transport_finish(struct sk_buff *skb, int async); 1372 extern int xfrm4_transport_finish(struct sk_buff *skb, int async);
1341 extern int xfrm4_rcv(struct sk_buff *skb); 1373 extern int xfrm4_rcv(struct sk_buff *skb);
1342 1374
1343 static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi) 1375 static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
1344 { 1376 {
1345 return xfrm4_rcv_encap(skb, nexthdr, spi, 0); 1377 return xfrm4_rcv_encap(skb, nexthdr, spi, 0);
1346 } 1378 }
1347 1379
1348 extern int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb); 1380 extern int xfrm4_extract_output(struct xfrm_state *x, struct sk_buff *skb);
1349 extern int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb); 1381 extern int xfrm4_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
1350 extern int xfrm4_output(struct sk_buff *skb); 1382 extern int xfrm4_output(struct sk_buff *skb);
1351 extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family); 1383 extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
1352 extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family); 1384 extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);
1353 extern int xfrm6_extract_header(struct sk_buff *skb); 1385 extern int xfrm6_extract_header(struct sk_buff *skb);
1354 extern int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb); 1386 extern int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb);
1355 extern int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi); 1387 extern int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi);
1356 extern int xfrm6_transport_finish(struct sk_buff *skb, int async); 1388 extern int xfrm6_transport_finish(struct sk_buff *skb, int async);
1357 extern int xfrm6_rcv(struct sk_buff *skb); 1389 extern int xfrm6_rcv(struct sk_buff *skb);
1358 extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr, 1390 extern int xfrm6_input_addr(struct sk_buff *skb, xfrm_address_t *daddr,
1359 xfrm_address_t *saddr, u8 proto); 1391 xfrm_address_t *saddr, u8 proto);
1360 extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family); 1392 extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler, unsigned short family);
1361 extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family); 1393 extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family);
1362 extern __be32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr); 1394 extern __be32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr);
1363 extern void xfrm6_tunnel_free_spi(xfrm_address_t *saddr); 1395 extern void xfrm6_tunnel_free_spi(xfrm_address_t *saddr);
1364 extern __be32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr); 1396 extern __be32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr);
1365 extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb); 1397 extern int xfrm6_extract_output(struct xfrm_state *x, struct sk_buff *skb);
1366 extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb); 1398 extern int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb);
1367 extern int xfrm6_output(struct sk_buff *skb); 1399 extern int xfrm6_output(struct sk_buff *skb);
1368 extern int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb, 1400 extern int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
1369 u8 **prevhdr); 1401 u8 **prevhdr);
1370 1402
1371 #ifdef CONFIG_XFRM 1403 #ifdef CONFIG_XFRM
1372 extern int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb); 1404 extern int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb);
1373 extern int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen); 1405 extern int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen);
1374 #else 1406 #else
1375 static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen) 1407 static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen)
1376 { 1408 {
1377 return -ENOPROTOOPT; 1409 return -ENOPROTOOPT;
1378 } 1410 }
1379 1411
1380 static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb) 1412 static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
1381 { 1413 {
1382 /* should not happen */ 1414 /* should not happen */
1383 kfree_skb(skb); 1415 kfree_skb(skb);
1384 return 0; 1416 return 0;
1385 } 1417 }
1386 #endif 1418 #endif
1387 1419
1388 struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp); 1420 struct xfrm_policy *xfrm_policy_alloc(gfp_t gfp);
1389 1421
1390 static inline void xfrm_policy_walk_init(struct xfrm_policy_walk *walk, u8 type) 1422 static inline void xfrm_policy_walk_init(struct xfrm_policy_walk *walk, u8 type)
1391 { 1423 {
1392 walk->cur_type = XFRM_POLICY_TYPE_MAIN; 1424 walk->cur_type = XFRM_POLICY_TYPE_MAIN;
1393 walk->type = type; 1425 walk->type = type;
1394 walk->policy = NULL; 1426 walk->policy = NULL;
1395 walk->count = 0; 1427 walk->count = 0;
1396 } 1428 }
1397 1429
1398 static inline void xfrm_policy_walk_done(struct xfrm_policy_walk *walk) 1430 static inline void xfrm_policy_walk_done(struct xfrm_policy_walk *walk)
1399 { 1431 {
1400 if (walk->policy != NULL) { 1432 if (walk->policy != NULL) {
1401 xfrm_pol_put(walk->policy); 1433 xfrm_pol_put(walk->policy);
1402 walk->policy = NULL; 1434 walk->policy = NULL;
1403 } 1435 }
1404 } 1436 }
1405 1437
1406 extern int xfrm_policy_walk(struct xfrm_policy_walk *walk, 1438 extern int xfrm_policy_walk(struct xfrm_policy_walk *walk,
1407 int (*func)(struct xfrm_policy *, int, int, void*), void *); 1439 int (*func)(struct xfrm_policy *, int, int, void*), void *);
1408 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl); 1440 int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl);
1409 struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir, 1441 struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir,
1410 struct xfrm_selector *sel, 1442 struct xfrm_selector *sel,
1411 struct xfrm_sec_ctx *ctx, int delete, 1443 struct xfrm_sec_ctx *ctx, int delete,
1412 int *err); 1444 int *err);
1413 struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete, int *err); 1445 struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete, int *err);
1414 int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info); 1446 int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info);
1415 u32 xfrm_get_acqseq(void); 1447 u32 xfrm_get_acqseq(void);
1416 extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi); 1448 extern int xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);
1417 struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto, 1449 struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto,
1418 xfrm_address_t *daddr, xfrm_address_t *saddr, 1450 xfrm_address_t *daddr, xfrm_address_t *saddr,
1419 int create, unsigned short family); 1451 int create, unsigned short family);
1420 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); 1452 extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
1421 extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst, 1453 extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
1422 struct flowi *fl, int family, int strict); 1454 struct flowi *fl, int family, int strict);
1423 1455
1424 #ifdef CONFIG_XFRM_MIGRATE 1456 #ifdef CONFIG_XFRM_MIGRATE
1425 extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type, 1457 extern int km_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
1426 struct xfrm_migrate *m, int num_bundles); 1458 struct xfrm_migrate *m, int num_bundles);
1427 extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m); 1459 extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m);
1428 extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x, 1460 extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x,
1429 struct xfrm_migrate *m); 1461 struct xfrm_migrate *m);
1430 extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type, 1462 extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type,
1431 struct xfrm_migrate *m, int num_bundles); 1463 struct xfrm_migrate *m, int num_bundles);
1432 #endif 1464 #endif
1433 1465
1434 extern wait_queue_head_t km_waitq; 1466 extern wait_queue_head_t km_waitq;
1435 extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); 1467 extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
1436 extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid); 1468 extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
1437 extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr); 1469 extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
1438 1470
1439 extern void xfrm_input_init(void); 1471 extern void xfrm_input_init(void);
1440 extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq); 1472 extern int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);
1441 1473
1442 extern void xfrm_probe_algs(void); 1474 extern void xfrm_probe_algs(void);
1443 extern int xfrm_count_auth_supported(void); 1475 extern int xfrm_count_auth_supported(void);
1444 extern int xfrm_count_enc_supported(void); 1476 extern int xfrm_count_enc_supported(void);
1445 extern struct xfrm_algo_desc *xfrm_aalg_get_byidx(unsigned int idx); 1477 extern struct xfrm_algo_desc *xfrm_aalg_get_byidx(unsigned int idx);
1446 extern struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx); 1478 extern struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx);
1447 extern struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id); 1479 extern struct xfrm_algo_desc *xfrm_aalg_get_byid(int alg_id);
1448 extern struct xfrm_algo_desc *xfrm_ealg_get_byid(int alg_id); 1480 extern struct xfrm_algo_desc *xfrm_ealg_get_byid(int alg_id);
1449 extern struct xfrm_algo_desc *xfrm_calg_get_byid(int alg_id); 1481 extern struct xfrm_algo_desc *xfrm_calg_get_byid(int alg_id);
1450 extern struct xfrm_algo_desc *xfrm_aalg_get_byname(char *name, int probe); 1482 extern struct xfrm_algo_desc *xfrm_aalg_get_byname(char *name, int probe);
1451 extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe); 1483 extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe);
1452 extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe); 1484 extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe);
1453 extern struct xfrm_algo_desc *xfrm_aead_get_byname(char *name, int icv_len, 1485 extern struct xfrm_algo_desc *xfrm_aead_get_byname(char *name, int icv_len,
1454 int probe); 1486 int probe);
1455 1487
1456 struct hash_desc; 1488 struct hash_desc;
1457 struct scatterlist; 1489 struct scatterlist;
1458 typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *, 1490 typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
1459 unsigned int); 1491 unsigned int);
1460 1492
1461 extern int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *tfm, 1493 extern int skb_icv_walk(const struct sk_buff *skb, struct hash_desc *tfm,
1462 int offset, int len, icv_update_fn_t icv_update); 1494 int offset, int len, icv_update_fn_t icv_update);
1463 1495
1464 static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b, 1496 static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
1465 int family) 1497 int family)
1466 { 1498 {
1467 switch (family) { 1499 switch (family) {
1468 default: 1500 default:
1469 case AF_INET: 1501 case AF_INET:
1470 return (__force __u32)a->a4 - (__force __u32)b->a4; 1502 return (__force __u32)a->a4 - (__force __u32)b->a4;
1471 case AF_INET6: 1503 case AF_INET6:
1472 return ipv6_addr_cmp((struct in6_addr *)a, 1504 return ipv6_addr_cmp((struct in6_addr *)a,
1473 (struct in6_addr *)b); 1505 (struct in6_addr *)b);
1474 } 1506 }
1475 } 1507 }
1476 1508
1477 static inline int xfrm_policy_id2dir(u32 index) 1509 static inline int xfrm_policy_id2dir(u32 index)
1478 { 1510 {
1479 return index & 7; 1511 return index & 7;
1480 } 1512 }
1481 1513
1482 static inline int xfrm_aevent_is_on(void) 1514 static inline int xfrm_aevent_is_on(void)
1483 { 1515 {
1484 struct sock *nlsk; 1516 struct sock *nlsk;
1485 int ret = 0; 1517 int ret = 0;
1486 1518
1487 rcu_read_lock(); 1519 rcu_read_lock();
1488 nlsk = rcu_dereference(xfrm_nl); 1520 nlsk = rcu_dereference(xfrm_nl);
1489 if (nlsk) 1521 if (nlsk)
1490 ret = netlink_has_listeners(nlsk, XFRMNLGRP_AEVENTS); 1522 ret = netlink_has_listeners(nlsk, XFRMNLGRP_AEVENTS);
1491 rcu_read_unlock(); 1523 rcu_read_unlock();
1492 return ret; 1524 return ret;
1493 } 1525 }
1494 1526
1495 static inline int xfrm_alg_len(struct xfrm_algo *alg) 1527 static inline int xfrm_alg_len(struct xfrm_algo *alg)
1496 { 1528 {
1497 return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); 1529 return sizeof(*alg) + ((alg->alg_key_len + 7) / 8);
1498 } 1530 }
1499 1531
1500 #ifdef CONFIG_XFRM_MIGRATE 1532 #ifdef CONFIG_XFRM_MIGRATE
1501 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig) 1533 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig)
1502 { 1534 {
1503 return kmemdup(orig, xfrm_alg_len(orig), GFP_KERNEL); 1535 return kmemdup(orig, xfrm_alg_len(orig), GFP_KERNEL);
1504 } 1536 }
1505 1537
1506 static inline void xfrm_states_put(struct xfrm_state **states, int n) 1538 static inline void xfrm_states_put(struct xfrm_state **states, int n)
1507 { 1539 {
1508 int i; 1540 int i;
1509 for (i = 0; i < n; i++) 1541 for (i = 0; i < n; i++)
1510 xfrm_state_put(*(states + i)); 1542 xfrm_state_put(*(states + i));
1511 } 1543 }
1512 1544
1513 static inline void xfrm_states_delete(struct xfrm_state **states, int n) 1545 static inline void xfrm_states_delete(struct xfrm_state **states, int n)
1514 { 1546 {
1515 int i; 1547 int i;
1516 for (i = 0; i < n; i++) 1548 for (i = 0; i < n; i++)
1517 xfrm_state_delete(*(states + i)); 1549 xfrm_state_delete(*(states + i));
1518 } 1550 }
1519 #endif 1551 #endif
1520 1552
1521 static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb) 1553 static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb)
1522 { 1554 {
1523 return skb->sp->xvec[skb->sp->len - 1]; 1555 return skb->sp->xvec[skb->sp->len - 1];
1524 } 1556 }
1525 1557
1526 #endif /* _NET_XFRM_H */ 1558 #endif /* _NET_XFRM_H */
1527 1559