31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
|
From 7210b25e452780f0792e04dd9f84f3a02c582ab7 Mon Sep 17 00:00:00 2001
|
||
|
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||
|
Date: Sat, 7 Nov 2015 11:23:34 +0100
|
||
|
Subject: [PATCH 2/3] netfilter: ipset: Fix hash:* type expiration
|
||
|
|
||
|
Incorrect index was used when the data blob was shrinked at expiration,
|
||
|
which could lead to falsely expired entries and memory leak when
|
||
|
the comment extension was used too.
|
||
|
|
||
|
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
|
||
|
---
|
||
|
net/netfilter/ipset/ip_set_hash_gen.h | 2 +-
|
||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
||
|
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
|
||
|
index 4ff22194ce55..fa4f6374bb73 100644
|
||
|
--- a/net/netfilter/ipset/ip_set_hash_gen.h
|
||
|
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
|
||
|
@@ -523,7 +523,7 @@ mtype_expire(struct ip_set *set, struct htype *h, u8 nets_length, size_t dsize)
|
||
|
continue;
|
||
|
data = ahash_data(n, j, dsize);
|
||
|
memcpy(tmp->value + d * dsize, data, dsize);
|
||
|
- set_bit(j, tmp->used);
|
||
|
+ set_bit(d, tmp->used);
|
||
|
d++;
|
||
|
}
|
||
|
tmp->pos = d;
|
||
|
--
|
||
|
2.4.3
|
||
|
|