* [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
@ 2020-04-23 2:10 Bo YU
2020-04-23 8:34 ` Paolo Abeni
2020-04-23 22:38 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Bo YU @ 2020-04-23 2:10 UTC (permalink / raw)
To: matthieu.baerts, davem, kuba, pabeni, mathew.j.martineau
Cc: netdev, mptcp, tsu.yubo
Normal there should be checked for nla_put_in6_addr like other
usage in net.
Detected by CoverityScan, CID# 1461639
Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
Signed-off-by: Bo YU <tsu.yubo@gmail.com>
---
V3: fix code style, thanks for Paolo
V2: Add check for nla_put_in_addr suggested by Paolo Abeni
---
net/mptcp/pm_netlink.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 86d61ab34c7c..b78edf237ba0 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -599,12 +599,14 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
goto nla_put_failure;
- if (addr->family == AF_INET)
- nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
- addr->addr.s_addr);
+ if (addr->family == AF_INET &&
+ nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
+ addr->addr.s_addr))
+ goto nla_put_failure;
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
- else if (addr->family == AF_INET6)
- nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
+ else if (addr->family == AF_INET6 &&
+ nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
+ goto nla_put_failure;
#endif
nla_nest_end(skb, attr);
return 0;
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
2020-04-23 2:10 [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr Bo YU
@ 2020-04-23 8:34 ` Paolo Abeni
2020-04-23 22:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Abeni @ 2020-04-23 8:34 UTC (permalink / raw)
To: Bo YU, matthieu.baerts, davem, kuba, mathew.j.martineau; +Cc: netdev, mptcp
On Thu, 2020-04-23 at 10:10 +0800, Bo YU wrote:
> Normal there should be checked for nla_put_in6_addr like other
> usage in net.
>
> Detected by CoverityScan, CID# 1461639
>
> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
> ---
> V3: fix code style, thanks for Paolo
>
> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
> ---
> net/mptcp/pm_netlink.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 86d61ab34c7c..b78edf237ba0 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -599,12 +599,14 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb,
> nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->ifindex))
> goto nla_put_failure;
>
> - if (addr->family == AF_INET)
> - nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> - addr->addr.s_addr);
> + if (addr->family == AF_INET &&
> + nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
> + addr->addr.s_addr))
> + goto nla_put_failure;
> #if IS_ENABLED(CONFIG_MPTCP_IPV6)
> - else if (addr->family == AF_INET6)
> - nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6);
> + else if (addr->family == AF_INET6 &&
> + nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
> + goto nla_put_failure;
> #endif
> nla_nest_end(skb, attr);
> return 0;
> --
> 2.11.0
Thanks for addressing my feedback!
Acked-by: Paolo Abeni <pabeni@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr
2020-04-23 2:10 [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr Bo YU
2020-04-23 8:34 ` Paolo Abeni
@ 2020-04-23 22:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2020-04-23 22:38 UTC (permalink / raw)
To: tsu.yubo; +Cc: matthieu.baerts, kuba, pabeni, mathew.j.martineau, netdev, mptcp
From: Bo YU <tsu.yubo@gmail.com>
Date: Thu, 23 Apr 2020 10:10:03 +0800
> Normal there should be checked for nla_put_in6_addr like other
> usage in net.
>
> Detected by CoverityScan, CID# 1461639
>
> Fixes: 01cacb00b35c("mptcp: add netlink-based PM")
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
> ---
> V3: fix code style, thanks for Paolo
>
> V2: Add check for nla_put_in_addr suggested by Paolo Abeni
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-23 22:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-23 2:10 [PATCH V3 -next] mptcp/pm_netlink.c : add check for nla_put_in/6_addr Bo YU
2020-04-23 8:34 ` Paolo Abeni
2020-04-23 22:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox