write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/net/ipv6/fib6_rules.c
..
..
@@ -1,12 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * net/ipv6/fib6_rules.c	IPv6 Routing Policy Rules
3
4
  *
4
5
  * Copyright (C)2003-2006 Helsinki University of Technology
5
6
  * Copyright (C)2003-2006 USAGI/WIDE Project
6
- *
7
- *	This program is free software; you can redistribute it and/or
8
- *	modify it under the terms of the GNU General Public License as
9
- *	published by the Free Software Foundation, version 2.
10
7
  *
11
8
  * Authors
12
9
  *	Thomas Graf		<tgraf@suug.ch>
..
..
@@ -16,6 +13,7 @@
16
13
 #include <linux/netdevice.h>
17
14
 #include <linux/notifier.h>
18
15
 #include <linux/export.h>
16
+#include <linux/indirect_call_wrapper.h>
19
17
 
20
18
 #include <net/fib_rules.h>
21
19
 #include <net/ipv6.h>
..
..
@@ -50,9 +48,10 @@
50
48
 }
51
49
 EXPORT_SYMBOL_GPL(fib6_rule_default);
52
50
 
53
-int fib6_rules_dump(struct net *net, struct notifier_block *nb)
51
+int fib6_rules_dump(struct net *net, struct notifier_block *nb,
52
+		    struct netlink_ext_ack *extack)
54
53
 {
55
-	return fib_rules_dump(net, nb, AF_INET6);
54
+	return fib_rules_dump(net, nb, AF_INET6, extack);
56
55
 }
57
56
 
58
57
 unsigned int fib6_rules_seq_read(struct net *net)
..
..
@@ -61,16 +60,16 @@
61
60
 }
62
61
 
63
62
 /* called with rcu lock held; no reference taken on fib6_info */
64
-struct fib6_info *fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,
65
-			      int flags)
63
+int fib6_lookup(struct net *net, int oif, struct flowi6 *fl6,
64
+		struct fib6_result *res, int flags)
66
65
 {
67
-	struct fib6_info *f6i;
68
66
 	int err;
69
67
 
70
68
 	if (net->ipv6.fib6_has_custom_rules) {
71
69
 		struct fib_lookup_arg arg = {
72
70
 			.lookup_ptr = fib6_table_lookup,
73
71
 			.lookup_data = &oif,
72
+			.result = res,
74
73
 			.flags = FIB_LOOKUP_NOREF,
75
74
 		};
76
75
 
..
..
@@ -78,19 +77,15 @@
78
77
 
79
78
 		err = fib_rules_lookup(net->ipv6.fib6_rules_ops,
80
79
 				       flowi6_to_flowi(fl6), flags, &arg);
81
-		if (err)
82
-			return ERR_PTR(err);
83
-
84
-		f6i = arg.result ? : net->ipv6.fib6_null_entry;
85
80
 	} else {
86
-		f6i = fib6_table_lookup(net, net->ipv6.fib6_local_tbl,
87
-					oif, fl6, flags);
88
-		if (!f6i || f6i == net->ipv6.fib6_null_entry)
89
-			f6i = fib6_table_lookup(net, net->ipv6.fib6_main_tbl,
90
-						oif, fl6, flags);
81
+		err = fib6_table_lookup(net, net->ipv6.fib6_local_tbl, oif,
82
+					fl6, res, flags);
83
+		if (err || res->f6i == net->ipv6.fib6_null_entry)
84
+			err = fib6_table_lookup(net, net->ipv6.fib6_main_tbl,
85
+						oif, fl6, res, flags);
91
86
 	}
92
87
 
93
-	return f6i;
88
+	return err;
94
89
 }
95
90
 
96
91
 struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,
..
..
@@ -98,9 +93,11 @@
98
93
 				   int flags, pol_lookup_t lookup)
99
94
 {
100
95
 	if (net->ipv6.fib6_has_custom_rules) {
96
+		struct fib6_result res = {};
101
97
 		struct fib_lookup_arg arg = {
102
98
 			.lookup_ptr = lookup,
103
99
 			.lookup_data = skb,
100
+			.result = &res,
104
101
 			.flags = FIB_LOOKUP_NOREF,
105
102
 		};
106
103
 
..
..
@@ -110,22 +107,25 @@
110
107
 		fib_rules_lookup(net->ipv6.fib6_rules_ops,
111
108
 				 flowi6_to_flowi(fl6), flags, &arg);
112
109
 
113
-		if (arg.result)
114
-			return arg.result;
110
+		if (res.rt6)
111
+			return &res.rt6->dst;
115
112
 	} else {
116
113
 		struct rt6_info *rt;
117
114
 
118
-		rt = lookup(net, net->ipv6.fib6_local_tbl, fl6, skb, flags);
115
+		rt = pol_lookup_func(lookup,
116
+			     net, net->ipv6.fib6_local_tbl, fl6, skb, flags);
119
117
 		if (rt != net->ipv6.ip6_null_entry && rt->dst.error != -EAGAIN)
120
118
 			return &rt->dst;
121
-		ip6_rt_put(rt);
122
-		rt = lookup(net, net->ipv6.fib6_main_tbl, fl6, skb, flags);
119
+		ip6_rt_put_flags(rt, flags);
120
+		rt = pol_lookup_func(lookup,
121
+			     net, net->ipv6.fib6_main_tbl, fl6, skb, flags);
123
122
 		if (rt->dst.error != -EAGAIN)
124
123
 			return &rt->dst;
125
-		ip6_rt_put(rt);
124
+		ip6_rt_put_flags(rt, flags);
126
125
 	}
127
126
 
128
-	dst_hold(&net->ipv6.ip6_null_entry->dst);
127
+	if (!(flags & RT6_LOOKUP_F_DST_NOREF))
128
+		dst_hold(&net->ipv6.ip6_null_entry->dst);
129
129
 	return &net->ipv6.ip6_null_entry->dst;
130
130
 }
131
131
 
..
..
@@ -157,11 +157,11 @@
157
157
 static int fib6_rule_action_alt(struct fib_rule *rule, struct flowi *flp,
158
158
 				int flags, struct fib_lookup_arg *arg)
159
159
 {
160
+	struct fib6_result *res = arg->result;
160
161
 	struct flowi6 *flp6 = &flp->u.ip6;
161
162
 	struct net *net = rule->fr_net;
162
163
 	struct fib6_table *table;
163
-	struct fib6_info *f6i;
164
-	int err = -EAGAIN, *oif;
164
+	int err, *oif;
165
165
 	u32 tb_id;
166
166
 
167
167
 	switch (rule->action) {
..
..
@@ -182,14 +182,12 @@
182
182
 		return -EAGAIN;
183
183
 
184
184
 	oif = (int *)arg->lookup_data;
185
-	f6i = fib6_table_lookup(net, table, *oif, flp6, flags);
186
-	if (f6i != net->ipv6.fib6_null_entry) {
185
+	err = fib6_table_lookup(net, table, *oif, flp6, res, flags);
186
+	if (!err && res->f6i != net->ipv6.fib6_null_entry)
187
187
 		err = fib6_rule_saddr(net, rule, flags, flp6,
188
-				      fib6_info_nh_dev(f6i));
189
-
190
-		if (likely(!err))
191
-			arg->result = f6i;
192
-	}
188
+				      res->nh->fib_nh_dev);
189
+	else
190
+		err = -EAGAIN;
193
191
 
194
192
 	return err;
195
193
 }
..
..
@@ -197,6 +195,7 @@
197
195
 static int __fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
198
196
 			      int flags, struct fib_lookup_arg *arg)
199
197
 {
198
+	struct fib6_result *res = arg->result;
200
199
 	struct flowi6 *flp6 = &flp->u.ip6;
201
200
 	struct rt6_info *rt = NULL;
202
201
 	struct fib6_table *table;
..
..
@@ -230,7 +229,8 @@
230
229
 		goto out;
231
230
 	}
232
231
 
233
-	rt = lookup(net, table, flp6, arg->lookup_data, flags);
232
+	rt = pol_lookup_func(lookup,
233
+			     net, table, flp6, arg->lookup_data, flags);
234
234
 	if (rt != net->ipv6.ip6_null_entry) {
235
235
 		err = fib6_rule_saddr(net, rule, flags, flp6,
236
236
 				      ip6_dst_idev(&rt->dst)->dev);
..
..
@@ -243,20 +243,22 @@
243
243
 			goto out;
244
244
 	}
245
245
 again:
246
-	ip6_rt_put(rt);
246
+	ip6_rt_put_flags(rt, flags);
247
247
 	err = -EAGAIN;
248
248
 	rt = NULL;
249
249
 	goto out;
250
250
 
251
251
 discard_pkt:
252
-	dst_hold(&rt->dst);
252
+	if (!(flags & RT6_LOOKUP_F_DST_NOREF))
253
+		dst_hold(&rt->dst);
253
254
 out:
254
-	arg->result = rt;
255
+	res->rt6 = rt;
255
256
 	return err;
256
257
 }
257
258
 
258
-static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp,
259
-			    int flags, struct fib_lookup_arg *arg)
259
+INDIRECT_CALLABLE_SCOPE int fib6_rule_action(struct fib_rule *rule,
260
+					     struct flowi *flp, int flags,
261
+					     struct fib_lookup_arg *arg)
260
262
 {
261
263
 	if (arg->lookup_ptr == fib6_table_lookup)
262
264
 		return fib6_rule_action_alt(rule, flp, flags, arg);
..
..
@@ -264,10 +266,16 @@
264
266
 	return __fib6_rule_action(rule, flp, flags, arg);
265
267
 }
266
268
 
267
-static bool fib6_rule_suppress(struct fib_rule *rule, struct fib_lookup_arg *arg)
269
+INDIRECT_CALLABLE_SCOPE bool fib6_rule_suppress(struct fib_rule *rule,
270
+						int flags,
271
+						struct fib_lookup_arg *arg)
268
272
 {
269
-	struct rt6_info *rt = (struct rt6_info *) arg->result;
273
+	struct fib6_result *res = arg->result;
274
+	struct rt6_info *rt = res->rt6;
270
275
 	struct net_device *dev = NULL;
276
+
277
+	if (!rt)
278
+		return false;
271
279
 
272
280
 	if (rt->rt6i_idev)
273
281
 		dev = rt->rt6i_idev->dev;
..
..
@@ -287,11 +295,12 @@
287
295
 	return false;
288
296
 
289
297
 suppress_route:
290
-	ip6_rt_put(rt);
298
+	ip6_rt_put_flags(rt, flags);
291
299
 	return true;
292
300
 }
293
301
 
294
-static int fib6_rule_match(struct fib_rule *rule, struct flowi *fl, int flags)
302
+INDIRECT_CALLABLE_SCOPE int fib6_rule_match(struct fib_rule *rule,
303
+					    struct flowi *fl, int flags)
295
304
 {
296
305
 	struct fib6_rule *r = (struct fib6_rule *) rule;
297
306
 	struct flowi6 *fl6 = &fl->u.ip6;