From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [libnftnl PATCH 6/6] obj/tunnel: Fix for undefined behaviour
Date: Tue, 15 Oct 2019 16:16:58 +0200 [thread overview]
Message-ID: <20191015141658.11325-7-phil@nwl.cc> (raw)
In-Reply-To: <20191015141658.11325-1-phil@nwl.cc>
Cppcheck complains: Shifting signed 32-bit value by 31 bits is undefined
behaviour.
Indeed, NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR enum value is 31. Make sure
behaviour is as intended by shifting unsigned 1.
Fixes: ea63a05272f54 ("obj: add tunnel support")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
src/obj/tunnel.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c
index 7ffade8c46ae7..100aa099c6e97 100644
--- a/src/obj/tunnel.c
+++ b/src/obj/tunnel.c
@@ -227,7 +227,7 @@ nftnl_obj_tunnel_build(struct nlmsghdr *nlh, const struct nftnl_obj *e)
if (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_VERSION) &&
(e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V1_INDEX) ||
(e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_HWID) &&
- e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR)))) {
+ e->flags & (1u << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR)))) {
struct nlattr *nest_inner;
nest = mnl_attr_nest_start(nlh, NFTA_TUNNEL_KEY_OPTS);
@@ -240,7 +240,7 @@ nftnl_obj_tunnel_build(struct nlmsghdr *nlh, const struct nftnl_obj *e)
if (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_HWID))
mnl_attr_put_u8(nlh, NFTA_TUNNEL_KEY_ERSPAN_V2_HWID,
tun->u.tun_erspan.u.v2.hwid);
- if (e->flags & (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR))
+ if (e->flags & (1u << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR))
mnl_attr_put_u8(nlh, NFTA_TUNNEL_KEY_ERSPAN_V2_DIR,
tun->u.tun_erspan.u.v2.dir);
mnl_attr_nest_end(nlh, nest_inner);
@@ -430,7 +430,7 @@ nftnl_obj_tunnel_parse_erspan(struct nftnl_obj *e, struct nlattr *attr,
if (tb[NFTA_TUNNEL_KEY_ERSPAN_V2_DIR]) {
tun->u.tun_erspan.u.v2.dir =
mnl_attr_get_u8(tb[NFTA_TUNNEL_KEY_ERSPAN_V2_DIR]);
- e->flags |= (1 << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR);
+ e->flags |= (1u << NFTNL_OBJ_TUNNEL_ERSPAN_V2_DIR);
}
return 0;
--
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 ` [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 ` Phil Sutter [this message]
2019-10-15 15:57 ` [libnftnl PATCH 6/6] obj/tunnel: Fix for undefined behaviour 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-7-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.