| From c7a24d96c6273c55d7cd765051ee7606d9076ddf Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 7 May 2020 09:29:42 +0300 |
| Subject: RDMA/core: Fix double put of resource |
| |
| From: Maor Gottlieb <maorg@mellanox.com> |
| |
| [ Upstream commit 50bbe3d34fea74b7c0fabe553c40c2f4a48bb9c3 ] |
| |
| Do not decrease the reference count of resource tracker object twice in |
| the error flow of res_get_common_doit. |
| |
| Fixes: c5dfe0ea6ffa ("RDMA/nldev: Add resource tracker doit callback") |
| Link: https://lore.kernel.org/r/20200507062942.98305-1-leon@kernel.org |
| Signed-off-by: Maor Gottlieb <maorg@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/infiniband/core/nldev.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c |
| index 9eec26d10d7b1..e16105be2eb23 100644 |
| --- a/drivers/infiniband/core/nldev.c |
| +++ b/drivers/infiniband/core/nldev.c |
| @@ -1292,11 +1292,10 @@ static int res_get_common_doit(struct sk_buff *skb, struct nlmsghdr *nlh, |
| has_cap_net_admin = netlink_capable(skb, CAP_NET_ADMIN); |
| |
| ret = fill_func(msg, has_cap_net_admin, res, port); |
| - |
| - rdma_restrack_put(res); |
| if (ret) |
| goto err_free; |
| |
| + rdma_restrack_put(res); |
| nlmsg_end(msg, nlh); |
| ib_device_put(device); |
| return rdma_nl_unicast(sock_net(skb->sk), msg, NETLINK_CB(skb).portid); |
| -- |
| 2.20.1 |
| |
