All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [libnftnl PATCH 3/6] set_elem: Validate nftnl_set_elem_set() parameters
Date: Tue, 15 Oct 2019 16:16:55 +0200	[thread overview]
Message-ID: <20191015141658.11325-4-phil@nwl.cc> (raw)
In-Reply-To: <20191015141658.11325-1-phil@nwl.cc>

Copying from nftnl_table_set_data(), validate input to
nftnl_set_elem_set() as well. Given that for some attributes the
function assumes passed data size, this seems necessary.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 include/libnftnl/set.h |  2 ++
 src/set_elem.c         | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/include/libnftnl/set.h b/include/libnftnl/set.h
index 6640ad929f346..2ea2e9a56ce4f 100644
--- a/include/libnftnl/set.h
+++ b/include/libnftnl/set.h
@@ -104,7 +104,9 @@ enum {
 	NFTNL_SET_ELEM_USERDATA,
 	NFTNL_SET_ELEM_EXPR,
 	NFTNL_SET_ELEM_OBJREF,
+	__NFTNL_SET_ELEM_MAX
 };
+#define NFTNL_SET_ELEM_MAX (__NFTNL_SET_ELEM_MAX - 1)
 
 struct nftnl_set_elem;
 
diff --git a/src/set_elem.c b/src/set_elem.c
index 3794f12594079..4225a96ee5a0a 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -96,10 +96,20 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
 	s->flags &= ~(1 << attr);
 }
 
+static uint32_t nftnl_set_elem_validate[NFTNL_SET_ELEM_MAX + 1] = {
+	[NFTNL_SET_ELEM_FLAGS]		= sizeof(uint32_t),
+	[NFTNL_SET_ELEM_VERDICT]	= sizeof(int), /* FIXME: data.verdict is int?! */
+	[NFTNL_SET_ELEM_TIMEOUT]	= sizeof(uint64_t),
+	[NFTNL_SET_ELEM_EXPIRATION]	= sizeof(uint64_t),
+};
+
 EXPORT_SYMBOL(nftnl_set_elem_set);
 int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
 		       const void *data, uint32_t data_len)
 {
+	nftnl_assert_attr_exists(attr, NFTNL_SET_ELEM_MAX);
+	nftnl_assert_validate(data, nftnl_set_elem_validate, attr, data_len);
+
 	switch(attr) {
 	case NFTNL_SET_ELEM_FLAGS:
 		memcpy(&s->set_elem_flags, data, sizeof(s->set_elem_flags));
-- 
2.23.0


  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 ` Phil Sutter [this message]
2019-10-15 15:52   ` [libnftnl PATCH 3/6] set_elem: Validate nftnl_set_elem_set() parameters 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 ` [libnftnl PATCH 4/6] set: Don't bypass checks in nftnl_set_set_u{32,64}() Phil Sutter
2019-10-15 15:53   ` 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-4-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.