netfilter: xt_hashlimit: validate hashtable supports XT_HASHLIMIT_RATE_MATCH
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: xt_hashlimit: validate hashtable supports XT_HASHLIMIT_RATE_MATCH
The XT_HASHLIMIT_RATE_MATCH flag mode changes the semantics of the dsthash_ent structure which represents an entry in the hashtable. Update .checkentry path to validate the XT_HASHLIMIT_RATE_MATCH flag mode is requested by two or more different rules that refer to the same hashtable.
Fixes bea74641e378 ("netfilter: xt_hashlimit: add rate match mode")
Reported-by Talha Berk Arslan <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/xt_hashlimit.c | 9 +++++++++ 1 file changed, 9 insertions(+)
net/netfilter/xt_hashlimit.c +9 -0
@@ -117,6 +117,7 @@ struct xt_hashlimit_htable {refcount_t use;u_int8_t family;bool rnd_initialized; +bool ratematch;struct hashlimit_cfg3 cfg;/* config */
@@ -323,6 +324,7 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,kvfree (hinfo);return -ENOMEM ; } + hinfo->ratematch = !!(cfg->mode &XT_HASHLIMIT_RATE_MATCH );spin_lock_init (&hinfo->lock);switch (revision) {
@@ -905,6 +907,13 @@ static int hashlimit_mt_check_common(const struct xt_mtchk_param *par,mutex_unlock (&hashlimit_mutex);return ret; } + }else { +if (cfg->mode &XT_HASHLIMIT_RATE_MATCH && + !(*hinfo)->ratematch) { +mutex_unlock (&hashlimit_mutex); +htable_put (*hinfo); +return -EINVAL ; + } }mutex_unlock (&hashlimit_mutex);
Signature · 1 line
2.47.3