diff mbox

IB/cma: Fix reference count leak when no ipv4 addresses are set

Message ID 1499372531-25392-1-git-send-email-Michal.Kalderon@cavium.com (mailing list archive)
State Accepted
Headers show

Commit Message

Kalderon, Michal July 6, 2017, 8:22 p.m. UTC 
Once in_dev_get is called to receive in_device pointer, the
in_device reference counter is increased, but if there are
no ipv4 addresses configured on the net-device the ifa_list
will be null, resulting in a flow that doesn't call in_dev_put
to decrease the ref_cnt.
This was exposed when running RoCE over ipv6 without any ipv4
addresses configured

Fixes: commit 8e3867310c90 ("IB/cma: Fix a race condition in iboe_addr_get_sgid()")

Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>

---
 include/rdma/ib_addr.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Doug Ledford July 22, 2017, 6:16 p.m. UTC | #1 
On 7/6/2017 4:22 PM, Michal Kalderon wrote:
> Once in_dev_get is called to receive in_device pointer, the
> in_device reference counter is increased, but if there are
> no ipv4 addresses configured on the net-device the ifa_list
> will be null, resulting in a flow that doesn't call in_dev_put
> to decrease the ref_cnt.
> This was exposed when running RoCE over ipv6 without any ipv4
> addresses configured
> 
> Fixes: commit 8e3867310c90 ("IB/cma: Fix a race condition in iboe_addr_get_sgid()")
> 
> Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
> Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>

This was accepted into 4.13-rc, thanks.
diff mbox

Patch

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 4b34c51..b73a14e 100644
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -205,11 +205,13 @@  static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr,
 	dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
 	if (dev) {
 		ip4 = in_dev_get(dev);
-		if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address) {
+		if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address)
 			ipv6_addr_set_v4mapped(ip4->ifa_list->ifa_address,
 					       (struct in6_addr *)gid);
+
+		if (ip4)
 			in_dev_put(ip4);
-		}
+
 		dev_put(dev);
 	}
 }