netfilter: nf_tables: reject expiration higher than timeout
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 2 Sep 2024 23:06:58 +0000 (01:06 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 3 Sep 2024 16:18:26 +0000 (18:18 +0200)
Report ERANGE to userspace if user specifies an expiration larger than
the timeout.

Fixes: 8e1102d5a159 ("netfilter: nf_tables: support timeouts larger than 23 days")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_tables_api.c

index da75bc1..6c0c6f8 100644 (file)
@@ -6930,6 +6930,9 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
                                            &expiration);
                if (err)
                        return err;
+
+               if (expiration > timeout)
+                       return -ERANGE;
        }
 
        if (nla[NFTA_SET_ELEM_EXPR]) {