2017-11-06 16:54:23

by Colin King

Subject: [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID

From: Colin Ian King <[email protected]>

The size for IFLA_IF_NETNSID is missing from the size calculation
because the proceeding semicolon was not removed. Fix this by removing
the semicolon.

Detected by CoverityScan, CID#1461135 ("Structurally dead code")

Fixes: 79e1ad148c84 ("rtnetlink: use netnsid to query interface")
Signed-off-by: Colin Ian King <[email protected]>
---
net/core/rtnetlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index dc5ad84ac096..dabba2a91fc8 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -920,7 +920,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
+ rtnl_xdp_size() /* IFLA_XDP */
+ nla_total_size(4) /* IFLA_EVENT */
+ nla_total_size(4) /* IFLA_NEW_NETNSID */
- + nla_total_size(1); /* IFLA_PROTO_DOWN */
+ + nla_total_size(1) /* IFLA_PROTO_DOWN */
+ nla_total_size(4) /* IFLA_IF_NETNSID */
+ 0;
}
--
2.14.1


From 1583330430635287655@xxx Mon Nov 06 15:19:26 +0000 2017
X-GM-THRID: 1583330430635287655
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread

2017-11-06 15:19:26

by Jiri Benc

Subject: Re: [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID

On Mon, 6 Nov 2017 15:04:54 +0000, Colin King wrote:
> The size for IFLA_IF_NETNSID is missing from the size calculation
> because the proceeding semicolon was not removed. Fix this by removing
> the semicolon.

Acked-by: Jiri Benc <[email protected]>

Thanks for spotting this! Looking at my initial code, I had that right,
this was probably introduced during one of rebases, so I blame
Flavio :-p (On a serious note, thank you, Flavio, for taking care of
the rebases.)

Hopefully, with the "+ 0" added, this won't happen again in this
particular piece of code in the future.

Jiri

From 1584193066470005711@xxx Thu Nov 16 03:50:39 +0000 2017
X-GM-THRID: 1583545544781961888
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread