RDMA/core: Properly return the error code of rdma_set_src_addr_rcu

YueHaibing · jgunthorpe · commit 0965cc953a23 · 2018-09-19T10:12:44.000-06:00
rdma_set_src_addr_rcu should check copy_src_l2_addr fails, rather than always return 0. Also copy_src_l2_addr should return 'ret' as its return value when rdma_translate_ip fails. Fixes: c31d4b2 ("RDMA/core: Protect against changing dst->dev during destination resolve") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Parav Pandit <parav@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
@@ -468,10 +468,10 @@ static int addr_resolve_neigh(const struct dst_entry *dst,
 	return ret;
 }
 
-static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
-			     const struct sockaddr *dst_in,
-			     const struct dst_entry *dst,
-			     const struct net_device *ndev)
+static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
+			    const struct sockaddr *dst_in,
+			    const struct dst_entry *dst,
+			    const struct net_device *ndev)
 {
 	int ret = 0;
 
@@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
 						RDMA_NETWORK_IPV6;
 	else
 		dev_addr->network = RDMA_NETWORK_IB;
+
+	return ret;
 }
 
 static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
@@ -515,8 +517,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
 			return -ENODEV;
 	}
 
-	copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
-	return 0;
+	return copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
 }
 
 static int set_addr_netns_by_gid_rcu(struct rdma_dev_addr *addr)

Original file line number	Diff line number	Diff line change
`@@ -468,10 +468,10 @@ static int addr_resolve_neigh(const struct dst_entry *dst,`
`468`	`468`	`return ret;`
`469`	`469`	`}`
`470`	`470`
`471`		`-static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,`
`472`		`- const struct sockaddr *dst_in,`
`473`		`- const struct dst_entry *dst,`
`474`		`- const struct net_device *ndev)`
	`471`	`+static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,`
	`472`	`+ const struct sockaddr *dst_in,`
	`473`	`+ const struct dst_entry *dst,`
	`474`	`+ const struct net_device *ndev)`
`475`	`475`	`{`
`476`	`476`	`int ret = 0;`
`477`	`477`
`@@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,`
`492`	`492`	`RDMA_NETWORK_IPV6;`
`493`	`493`	`else`
`494`	`494`	`dev_addr->network = RDMA_NETWORK_IB;`
	`495`	`+`
	`496`	`+ return ret;`
`495`	`497`	`}`
`496`	`498`
`497`	`499`	`static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,`
`@@ -515,8 +517,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,`
`515`	`517`	`return -ENODEV;`
`516`	`518`	`}`
`517`	`519`
`518`		`- copy_src_l2_addr(dev_addr, dst_in, dst, ndev);`
`519`		`- return 0;`
	`520`	`+ return copy_src_l2_addr(dev_addr, dst_in, dst, ndev);`
`520`	`521`	`}`
`521`	`522`
`522`	`523`	`static int set_addr_netns_by_gid_rcu(struct rdma_dev_addr *addr)`