mptcp/pm_netlink.c : add check for nla_put_in/6_addr
Subsystems (3)
PATCH v3 1/1 mptcp/pm_netlink.c : add check for nla_put_in/6_addr
Normal there should be checked for nla_put_in6_addr like other usage in net.
Detected by CoverityScan, CID# 1461639
---
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(-)
net/mptcp/pm_netlink.c +7 -5
@@ -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
Quoted 40 lines · Bo YU
Normal there should be checked for
nla_put_in6_addrlike other usage in net.Detected by CoverityScan, CID# 1461639
Fixes 01cacb00b35c("mptcp: add netlink-based PM")Signed-off-by Bo YU <tsu.yubo(a)gmail.com>---
V3: fix code style, thanks for PaoloV2: Add check for
nla_put_in_addrsuggested by Paolo Abeni--- net/mptcp/pm_netlink.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)net/mptcp/pm_netlink.c +7
-6@@ -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 ; --
Quoted 1 line
2.11.0
Thanks for addressing my feedback!
From: Bo YU <tsu.yubo(a)gmail.com>
Date: Thu, 23 Apr 2020 10:10:03 +0800
Quoted 11 lines
Normal there should be checked for
nla_put_in6_addrlike other usage in net.Detected by CoverityScan, CID# 1461639
Fixes 01cacb00b35c("mptcp: add netlink-based PM")Signed-off-by Bo YU <tsu.yubo(a)gmail.com>---
V3: fix code style, thanks for PaoloV2: Add check for
nla_put_in_addrsuggested by Paolo Abeni
Applied, thank you.