From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [libnftnl PATCH 4/6] set: Don't bypass checks in nftnl_set_set_u{32,64}()
Date: Tue, 15 Oct 2019 16:16:56 +0200 [thread overview]
Message-ID: <20191015141658.11325-5-phil@nwl.cc> (raw)
In-Reply-To: <20191015141658.11325-1-phil@nwl.cc>
By calling nftnl_set_set(), any data size checks are effectively
bypassed. Better call nftnl_set_set_data() directly, passing the real
size for validation.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
src/set.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/set.c b/src/set.c
index e6db7258cc224..b1ffe7e6de975 100644
--- a/src/set.c
+++ b/src/set.c
@@ -195,6 +195,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
return 0;
}
+/* XXX: Deprecate this, it is simply unsafe */
EXPORT_SYMBOL(nftnl_set_set);
int nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data)
{
@@ -204,13 +205,13 @@ int nftnl_set_set(struct nftnl_set *s, uint16_t attr, const void *data)
EXPORT_SYMBOL(nftnl_set_set_u32);
void nftnl_set_set_u32(struct nftnl_set *s, uint16_t attr, uint32_t val)
{
- nftnl_set_set(s, attr, &val);
+ nftnl_set_set_data(s, attr, &val, sizeof(uint32_t));
}
EXPORT_SYMBOL(nftnl_set_set_u64);
void nftnl_set_set_u64(struct nftnl_set *s, uint16_t attr, uint64_t val)
{
- nftnl_set_set(s, attr, &val);
+ nftnl_set_set_data(s, attr, &val, sizeof(uint64_t));
}
EXPORT_SYMBOL(nftnl_set_set_str);
--
2.23.0
next prev parent reply other threads:[~2019-10-15 14:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 14:16 [libnftnl PATCH 0/6] A series of covscan-indicated fixes Phil Sutter
2019-10-15 14:16 ` [libnftnl PATCH 1/6] obj: ct_timeout: Check return code of mnl_attr_parse_nested() Phil Sutter
2019-10-15 15:51 ` Pablo Neira Ayuso
2019-10-15 14:16 ` [libnftnl PATCH 2/6] set_elem: Fix return code of nftnl_set_elem_set() Phil Sutter
2019-10-15 15:51 ` Pablo Neira Ayuso
2019-10-15 14:16 ` [libnftnl PATCH 3/6] set_elem: Validate nftnl_set_elem_set() parameters Phil Sutter
2019-10-15 15:52 ` Pablo Neira Ayuso
2019-10-15 16:02 ` Phil Sutter
2019-10-15 16:09 ` Pablo Neira Ayuso
2019-10-15 16:25 ` Phil Sutter
2019-10-15 16:35 ` Pablo Neira Ayuso
2019-10-15 14:16 ` Phil Sutter [this message]
2019-10-15 15:53 ` [libnftnl PATCH 4/6] set: Don't bypass checks in nftnl_set_set_u{32,64}() Pablo Neira Ayuso
2019-10-15 16:11 ` Phil Sutter
2019-10-15 16:32 ` Pablo Neira Ayuso
2019-10-15 17:09 ` Phil Sutter
2019-10-15 17:33 ` Pablo Neira Ayuso
2019-10-15 14:16 ` [libnftnl PATCH 5/6] obj/ct_timeout: Avoid array overrun in timeout_parse_attr_data() Phil Sutter
2019-10-15 15:57 ` Pablo Neira Ayuso
2019-10-15 16:21 ` Phil Sutter
2019-10-15 16:33 ` Pablo Neira Ayuso
2019-10-15 16:35 ` Phil Sutter
2019-10-15 16:37 ` Pablo Neira Ayuso
2019-10-15 17:27 ` Phil Sutter
2019-10-15 17:33 ` Pablo Neira Ayuso
2019-10-15 14:16 ` [libnftnl PATCH 6/6] obj/tunnel: Fix for undefined behaviour Phil Sutter
2019-10-15 15:57 ` 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=20191015141658.11325-5-phil@nwl.cc \
--to=phil@nwl.cc \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.