* [PATCH] RDMA/iwpm: fix memory leak on map_info
@ 2018-04-25 16:24 ` Colin King
0 siblings, 0 replies; 4+ messages in thread
From: Colin King @ 2018-04-25 16:24 UTC (permalink / raw)
To: Doug Ledford, Jason Gunthorpe, Leon Romanovsky, linux-rdma
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
In the cases where iwpm_hash_bucket is NULL and where function
get_mapinfo_hash_bucket returns NULL then the map_info is never added
to hash_bucket_head and hence there is a leak of map_info. Fix this
by nullifying hash_bucket_head and if that is null we know that
that map_info was not added to hash_bucket_head and hence map_info
should be free'd.
Detected by CoverityScan, CID#1222481 ("Resource Leak")
Fixes: 30dc5e63d6a5 ("RDMA/core: Add support for iWARP Port Mapper user space service")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/infiniband/core/iwpm_util.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c
index 9821ae900f6d..da12da1c36f6 100644
--- a/drivers/infiniband/core/iwpm_util.c
+++ b/drivers/infiniband/core/iwpm_util.c
@@ -114,7 +114,7 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
struct sockaddr_storage *mapped_sockaddr,
u8 nl_client)
{
- struct hlist_head *hash_bucket_head;
+ struct hlist_head *hash_bucket_head = NULL;
struct iwpm_mapping_info *map_info;
unsigned long flags;
int ret = -EINVAL;
@@ -142,6 +142,9 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
}
}
spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
+
+ if (!hash_bucket_head)
+ kfree(map_info);
return ret;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] RDMA/iwpm: fix memory leak on map_info
@ 2018-04-25 16:24 ` Colin King
0 siblings, 0 replies; 4+ messages in thread
From: Colin King @ 2018-04-25 16:24 UTC (permalink / raw)
To: Doug Ledford, Jason Gunthorpe, Leon Romanovsky, linux-rdma
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
In the cases where iwpm_hash_bucket is NULL and where function
get_mapinfo_hash_bucket returns NULL then the map_info is never added
to hash_bucket_head and hence there is a leak of map_info. Fix this
by nullifying hash_bucket_head and if that is null we know that
that map_info was not added to hash_bucket_head and hence map_info
should be free'd.
Detected by CoverityScan, CID#1222481 ("Resource Leak")
Fixes: 30dc5e63d6a5 ("RDMA/core: Add support for iWARP Port Mapper user space service")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/infiniband/core/iwpm_util.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/infiniband/core/iwpm_util.c b/drivers/infiniband/core/iwpm_util.c
index 9821ae900f6d..da12da1c36f6 100644
--- a/drivers/infiniband/core/iwpm_util.c
+++ b/drivers/infiniband/core/iwpm_util.c
@@ -114,7 +114,7 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
struct sockaddr_storage *mapped_sockaddr,
u8 nl_client)
{
- struct hlist_head *hash_bucket_head;
+ struct hlist_head *hash_bucket_head = NULL;
struct iwpm_mapping_info *map_info;
unsigned long flags;
int ret = -EINVAL;
@@ -142,6 +142,9 @@ int iwpm_create_mapinfo(struct sockaddr_storage *local_sockaddr,
}
}
spin_unlock_irqrestore(&iwpm_mapinfo_lock, flags);
+
+ if (!hash_bucket_head)
+ kfree(map_info);
return ret;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] RDMA/iwpm: fix memory leak on map_info
2018-04-25 16:24 ` Colin King
@ 2018-04-27 18:23 ` Doug Ledford
-1 siblings, 0 replies; 4+ messages in thread
From: Doug Ledford @ 2018-04-27 18:23 UTC (permalink / raw)
To: Colin King, Jason Gunthorpe, Leon Romanovsky, linux-rdma
Cc: kernel-janitors, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
On Wed, 2018-04-25 at 17:24 +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> In the cases where iwpm_hash_bucket is NULL and where function
> get_mapinfo_hash_bucket returns NULL then the map_info is never added
> to hash_bucket_head and hence there is a leak of map_info. Fix this
> by nullifying hash_bucket_head and if that is null we know that
> that map_info was not added to hash_bucket_head and hence map_info
> should be free'd.
>
> Detected by CoverityScan, CID#1222481 ("Resource Leak")
>
> Fixes: 30dc5e63d6a5 ("RDMA/core: Add support for iWARP Port Mapper user space service")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks, applied to for-rc.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] RDMA/iwpm: fix memory leak on map_info
@ 2018-04-27 18:23 ` Doug Ledford
0 siblings, 0 replies; 4+ messages in thread
From: Doug Ledford @ 2018-04-27 18:23 UTC (permalink / raw)
To: Colin King, Jason Gunthorpe, Leon Romanovsky, linux-rdma
Cc: kernel-janitors, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 873 bytes --]
On Wed, 2018-04-25 at 17:24 +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> In the cases where iwpm_hash_bucket is NULL and where function
> get_mapinfo_hash_bucket returns NULL then the map_info is never added
> to hash_bucket_head and hence there is a leak of map_info. Fix this
> by nullifying hash_bucket_head and if that is null we know that
> that map_info was not added to hash_bucket_head and hence map_info
> should be free'd.
>
> Detected by CoverityScan, CID#1222481 ("Resource Leak")
>
> Fixes: 30dc5e63d6a5 ("RDMA/core: Add support for iWARP Port Mapper user space service")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Thanks, applied to for-rc.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-27 18:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-25 16:24 [PATCH] RDMA/iwpm: fix memory leak on map_info Colin King
2018-04-25 16:24 ` Colin King
2018-04-27 18:23 ` Doug Ledford
2018-04-27 18:23 ` Doug Ledford
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.