Skip to content

Commit cdef485

Browse files
msizanoen1davem330
authored andcommitted
ipv6: fix memory leak in fib6_rule_suppress
The kernel leaks memory when a `fib` rule is present in IPv6 nftables firewall rules and a suppress_prefix rule is present in the IPv6 routing rules (used by certain tools such as wg-quick). In such scenarios, every incoming packet will leak an allocation in `ip6_dst_cache` slab cache. After some hours of `bpftrace`-ing and source code reading, I tracked down the issue to ca7a03c ("ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule"). The problem with that change is that the generic `args->flags` always have `FIB_LOOKUP_NOREF` set[1][2] but the IPv6-specific flag `RT6_LOOKUP_F_DST_NOREF` might not be, leading to `fib6_rule_suppress` not decreasing the refcount when needed. How to reproduce: - Add the following nftables rule to a prerouting chain: meta nfproto ipv6 fib saddr . mark . iif oif missing drop This can be done with: sudo nft create table inet test sudo nft create chain inet test test_chain '{ type filter hook prerouting priority filter + 10; policy accept; }' sudo nft add rule inet test test_chain meta nfproto ipv6 fib saddr . mark . iif oif missing drop - Run: sudo ip -6 rule add table main suppress_prefixlength 0 - Watch `sudo slabtop -o | grep ip6_dst_cache` to see memory usage increase with every incoming ipv6 packet. This patch exposes the protocol-specific flags to the protocol specific `suppress` function, and check the protocol-specific `flags` argument for RT6_LOOKUP_F_DST_NOREF instead of the generic FIB_LOOKUP_NOREF when decreasing the refcount, like this. [1]: https://github.com/torvalds/linux/blob/ca7a03c4175366a92cee0ccc4fec0038c3266e26/net/ipv6/fib6_rules.c#L71 [2]: https://github.com/torvalds/linux/blob/ca7a03c4175366a92cee0ccc4fec0038c3266e26/net/ipv6/fib6_rules.c#L99 Link: https://bugzilla.kernel.org/show_bug.cgi?id=215105 Fixes: ca7a03c ("ipv6: do not free rt if FIB_LOOKUP_NOREF is set on suppress rule") Cc: [email protected] Signed-off-by: Jason A. Donenfeld <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d00a50c commit cdef485

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

include/net/fib_rules.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct fib_rules_ops {
6969
int (*action)(struct fib_rule *,
7070
struct flowi *, int,
7171
struct fib_lookup_arg *);
72-
bool (*suppress)(struct fib_rule *,
72+
bool (*suppress)(struct fib_rule *, int,
7373
struct fib_lookup_arg *);
7474
int (*match)(struct fib_rule *,
7575
struct flowi *, int);
@@ -218,7 +218,9 @@ INDIRECT_CALLABLE_DECLARE(int fib4_rule_action(struct fib_rule *rule,
218218
struct fib_lookup_arg *arg));
219219

220220
INDIRECT_CALLABLE_DECLARE(bool fib6_rule_suppress(struct fib_rule *rule,
221+
int flags,
221222
struct fib_lookup_arg *arg));
222223
INDIRECT_CALLABLE_DECLARE(bool fib4_rule_suppress(struct fib_rule *rule,
224+
int flags,
223225
struct fib_lookup_arg *arg));
224226
#endif

net/core/fib_rules.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ int fib_rules_lookup(struct fib_rules_ops *ops, struct flowi *fl,
323323
if (!err && ops->suppress && INDIRECT_CALL_MT(ops->suppress,
324324
fib6_rule_suppress,
325325
fib4_rule_suppress,
326-
rule, arg))
326+
rule, flags, arg))
327327
continue;
328328

329329
if (err != -EAGAIN) {

net/ipv4/fib_rules.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ INDIRECT_CALLABLE_SCOPE int fib4_rule_action(struct fib_rule *rule,
141141
}
142142

143143
INDIRECT_CALLABLE_SCOPE bool fib4_rule_suppress(struct fib_rule *rule,
144+
int flags,
144145
struct fib_lookup_arg *arg)
145146
{
146147
struct fib_result *result = (struct fib_result *) arg->result;

net/ipv6/fib6_rules.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ INDIRECT_CALLABLE_SCOPE int fib6_rule_action(struct fib_rule *rule,
267267
}
268268

269269
INDIRECT_CALLABLE_SCOPE bool fib6_rule_suppress(struct fib_rule *rule,
270+
int flags,
270271
struct fib_lookup_arg *arg)
271272
{
272273
struct fib6_result *res = arg->result;
@@ -294,8 +295,7 @@ INDIRECT_CALLABLE_SCOPE bool fib6_rule_suppress(struct fib_rule *rule,
294295
return false;
295296

296297
suppress_route:
297-
if (!(arg->flags & FIB_LOOKUP_NOREF))
298-
ip6_rt_put(rt);
298+
ip6_rt_put_flags(rt, flags);
299299
return true;
300300
}
301301

0 commit comments

Comments
 (0)