Skip to contentSkip to conversation

mptcp/pm_netlink.c : add check for nla_put_in/6_addr

PATCH Applied Bo YU 3 participants 3 messages Apr 23, 2020

Subsystems (3)
lore
Share & tools
lore

Bo YU

author
#0 lore raw

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

Fixes 01cacb00b35c("mptcp: add netlink-based PM")
Signed-off-by Bo YU <tsu.yubo(a)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(-)
net/mptcp/pm_netlink.c +7 -5
index 86d61ab34c7c..b78edf237ba0 100644
@@ -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

maintainer Acked-by on v3 1/1
#1 lore raw
Quoted 40 lines · Bo YU

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(a)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(-)
net/mptcp/pm_netlink.c +7 -6
index 86d61ab34c7c..b78edf237ba0 100644
@@ -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!

Acked-by Paolo Abeni <pabeni(a)redhat.com>
maintainer Applied
#2 lore raw
In reply to Bo YU

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_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(a)gmail.com>

---
V3: fix code style, thanks for Paolo

V2: Add check for nla_put_in_addr suggested by Paolo Abeni

Applied, thank you.