From: Patrick McHardy <kaber@trash.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 1/4] netfilter: nf_tables: fix set selection when timeouts are requested
Date: Sun, 5 Apr 2015 14:41:05 +0200 [thread overview]
Message-ID: <1428237668-31789-2-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1428237668-31789-1-git-send-email-kaber@trash.net>
The NFT_SET_TIMEOUT flag is ignore in nft_select_set_ops, which may
lead to selection of a set implementation that doesn't actually
support timeouts.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/nf_tables_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 3aa92b3..0dab872 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2159,7 +2159,7 @@ nft_select_set_ops(const struct nlattr * const nla[],
features = 0;
if (nla[NFTA_SET_FLAGS] != NULL) {
features = ntohl(nla_get_be32(nla[NFTA_SET_FLAGS]));
- features &= NFT_SET_INTERVAL | NFT_SET_MAP;
+ features &= NFT_SET_INTERVAL | NFT_SET_MAP | NFT_SET_TIMEOUT;
}
bops = NULL;
--
2.1.0
next prev parent reply other threads:[~2015-04-05 12:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 12:41 [PATCH 0/4] netfilter: nf_tables: dynamic set updates Patrick McHardy
2015-04-05 12:41 ` Patrick McHardy [this message]
2015-04-05 12:41 ` [PATCH 2/4] netfilter: nf_tables: prepare set element accounting for async updates Patrick McHardy
2015-04-05 12:41 ` [PATCH 3/4] netfilter: nf_tables: support different set binding types Patrick McHardy
2015-04-05 12:41 ` [PATCH 4/4] netfilter: nf_tables: add support for dynamic set updates Patrick McHardy
2015-04-08 16:57 ` [PATCH 0/4] netfilter: nf_tables: " Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428237668-31789-2-git-send-email-kaber@trash.net \
--to=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).