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 1/6] obj: ct_timeout: Check return code of mnl_attr_parse_nested()
Date: Tue, 15 Oct 2019 16:16:53 +0200	[thread overview]
Message-ID: <20191015141658.11325-2-phil@nwl.cc> (raw)
In-Reply-To: <20191015141658.11325-1-phil@nwl.cc>

Don't ignore nested attribute parsing errors, this may hide bugs in
users' code.

Fixes: 0adceeab1597a ("src: add ct timeout support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/obj/ct_timeout.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
index e2e99917de7ae..a439432deee18 100644
--- a/src/obj/ct_timeout.c
+++ b/src/obj/ct_timeout.c
@@ -116,7 +116,7 @@ parse_timeout_attr_policy_cb(const struct nlattr *attr, void *data)
 	return MNL_CB_OK;
 }
 
-static void
+static int
 timeout_parse_attr_data(struct nftnl_obj *e,
 			const struct nlattr *nest)
 {
@@ -131,7 +131,8 @@ timeout_parse_attr_data(struct nftnl_obj *e,
 
 	memset(tb, 0, sizeof(struct nlattr *) * attr_max);
 
-	mnl_attr_parse_nested(nest, parse_timeout_attr_policy_cb, &cnt);
+	if (mnl_attr_parse_nested(nest, parse_timeout_attr_policy_cb, &cnt) < 0)
+		return -1;
 
 	for (i = 1; i <= attr_max; i++) {
 		if (tb[i]) {
@@ -139,6 +140,7 @@ timeout_parse_attr_data(struct nftnl_obj *e,
 				ntohl(mnl_attr_get_u32(tb[i])));
 		}
 	}
+	return 0;
 }
 
 static int nftnl_obj_ct_timeout_set(struct nftnl_obj *e, uint16_t type,
@@ -248,7 +250,8 @@ nftnl_obj_ct_timeout_parse(struct nftnl_obj *e, struct nlattr *attr)
 		e->flags |= (1 << NFTNL_OBJ_CT_TIMEOUT_L4PROTO);
 	}
 	if (tb[NFTA_CT_TIMEOUT_DATA]) {
-		timeout_parse_attr_data(e, tb[NFTA_CT_TIMEOUT_DATA]);
+		if (timeout_parse_attr_data(e, tb[NFTA_CT_TIMEOUT_DATA]) < 0)
+			return -1;
 		e->flags |= (1 << NFTNL_OBJ_CT_TIMEOUT_ARRAY);
 	}
 	return 0;
-- 
2.23.0


  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 ` Phil Sutter [this message]
2019-10-15 15:51   ` [libnftnl PATCH 1/6] obj: ct_timeout: Check return code of mnl_attr_parse_nested() 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 ` [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-2-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.