* [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID
@ 2017-11-06 15:04 Colin King
2017-11-06 15:16 ` Jiri Benc
2017-11-08 4:46 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Colin King @ 2017-11-06 15:04 UTC (permalink / raw)
To: David S . Miller, David Ahern, Jiri Benc, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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 <colin.king@canonical.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID
2017-11-06 15:04 [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID Colin King
@ 2017-11-06 15:16 ` Jiri Benc
2017-11-16 4:56 ` Flavio Leitner
2017-11-08 4:46 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Jiri Benc @ 2017-11-06 15:16 UTC (permalink / raw)
To: Colin King
Cc: David S . Miller, David Ahern, netdev, kernel-janitors,
linux-kernel
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 <jbenc@redhat.com>
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID
2017-11-06 15:16 ` Jiri Benc
@ 2017-11-16 4:56 ` Flavio Leitner
0 siblings, 0 replies; 4+ messages in thread
From: Flavio Leitner @ 2017-11-16 4:56 UTC (permalink / raw)
To: Jiri Benc
Cc: Colin King, David S . Miller, David Ahern, netdev,
kernel-janitors, linux-kernel
On Mon, 6 Nov 2017 16:16:20 +0100
Jiri Benc <jbenc@redhat.com> wrote:
> 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 <jbenc@redhat.com>
>
> 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.)
That's right, ouch!
Thanks for fixing it.
--
Flavio
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID
2017-11-06 15:04 [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID Colin King
2017-11-06 15:16 ` Jiri Benc
@ 2017-11-08 4:46 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2017-11-08 4:46 UTC (permalink / raw)
To: colin.king; +Cc: dsahern, jbenc, netdev, kernel-janitors, linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Mon, 6 Nov 2017 15:04:54 +0000
> From: Colin Ian King <colin.king@canonical.com>
>
> 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 <colin.king@canonical.com>
Applied to net-next, thank you!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-16 5:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-06 15:04 [PATCH] rtnetlink: fix missing size for IFLA_IF_NETNSID Colin King
2017-11-06 15:16 ` Jiri Benc
2017-11-16 4:56 ` Flavio Leitner
2017-11-08 4:46 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).