IB/core: Fix potential NULL pointer dereference in pkey cache
PATCH 1/1 IB/core: Fix potential NULL pointer dereference in pkey cache
From: Jack Morgenstein <[email protected]>
The IB core pkey cache is populated by procedure ib_cache_update(). Initially, the pkey cache pointer is NULL. ib_cache_update allocates a buffer and populates it with the device's pkeys, via repeated calls to procedure ib_query_pkey().
If there is a failure in populating the pkey buffer via ib_query_pkey(), ib_cache_update does not replace the old pkey buffer cache with the updated one -- it leaves the old cache as is.
Since initially the pkey buffer cache is NULL, when calling ib_cache_update the first time, a failure in ib_query_pkey() will cause the pkey buffer cache pointer to remain NULL.
In this situation, any calls subsequent to ib_get_cached_pkey(), ib_find_cached_pkey(), or ib_find_cached_pkey_exact() will try to dereference the NULL pkey cache pointer, causing a kernel panic.
Fix this by testing if the cache pointer is NULL. If yes, return -ENOENT.
--- drivers/infiniband/core/cache.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/infiniband/core/cache.c +12 -0
@@ -1054,11 +1054,17 @@ int ib_get_cached_pkey(struct ib_device *device, cache = device->port_data[port_num].cache.pkey; +if (!cache) { + ret = -ENOENT ; + goto out; + } +if (index <0 || index >= cache->table_len) ret = -EINVAL ;else *pkey = cache->table[index]; +out:read_unlock_irqrestore (&device->cache_lock, flags);return ret;
@@ -1101,6 +1107,8 @@ int ib_find_cached_pkey(struct ib_device *device, cache = device->port_data[port_num].cache.pkey; *index =-1 ; +if (!cache) + goto out;for (i =0 ; i < cache->table_len; ++i)if ((cache->table[i] &0x7fff ) == (pkey &0x7fff )) {
@@ -1117,6 +1125,7 @@ int ib_find_cached_pkey(struct ib_device *device, ret =0 ; } +out:read_unlock_irqrestore (&device->cache_lock, flags);return ret;
@@ -1141,6 +1150,8 @@ int ib_find_exact_cached_pkey(struct ib_device *device, cache = device->port_data[port_num].cache.pkey; *index =-1 ; +if (!cache) + goto out;for (i =0 ; i < cache->table_len; ++i)if (cache->table[i] == pkey) {
@@ -1149,6 +1160,7 @@ int ib_find_exact_cached_pkey(struct ib_device *device,break ; } +out:read_unlock_irqrestore (&device->cache_lock, flags);return ret;
Signature · 1 line
2.25.3
Quoted 10 lines · Leon Romanovsky
From: Jack Morgenstein <[email protected]>
The IB core pkey cache is populated by procedure
ib_cache_update(). Initially, the pkey cache pointer is NULL.ib_cache_updateallocates a buffer and populates it with the device's pkeys, via repeated calls to procedureib_query_pkey().If there is a failure in populating the pkey buffer via
ib_query_pkey(),ib_cache_updatedoes not replace the old pkey buffer cache with the updated one -- it leaves the old cache as is.
The bug described here is that ib_cache_setup_one() ignores the return codes from ib_cache_update()
Device registration should fail if the cache could not be loaded, just fix ib_cache_setup_one()
Jason
Quoted 12 lines · Jason Gunthorpe
Quoted 10 lines · Leon Romanovsky
From: Jack Morgenstein <[email protected]>
The IB core pkey cache is populated by procedure
ib_cache_update(). Initially, the pkey cache pointer is NULL.ib_cache_updateallocates a buffer and populates it with the device's pkeys, via repeated calls to procedureib_query_pkey().If there is a failure in populating the pkey buffer via
ib_query_pkey(),ib_cache_updatedoes not replace the old pkey buffer cache with the updated one -- it leaves the old cache as is.
Quoted 5 lines
The bug described here is that
ib_cache_setup_one()ignores the return codes fromib_cache_update()Device registration should fail if the cache could not be loaded, just fix
ib_cache_setup_one()
Thanks, it is much easy fix.
Quoted 2 lines
Jason