diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-04-22 10:13:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-22 17:19:39 +0200 |
| commit | 4e224719f5d9b92abf1e0edfb2a83053208f3026 (patch) | |
| tree | 512b84d64968dacd757053f5118c942cc27ca4ca /drivers/base | |
| parent | 3677563eb8731e1ad5970e3e57f74e5f9d63502a (diff) | |
| download | linux-4e224719f5d9b92abf1e0edfb2a83053208f3026.tar.bz2 | |
drivers/base/memory: Fix an unlikely reference counting issue in __add_memory_block()
__add_memory_block() calls both put_device() and device_unregister() when
storing the memory block into the xarray. This is incorrect because xarray
doesn't take an additional reference and device_unregister() already calls
put_device().
Triggering the issue looks really unlikely and its only effect should be to
log a spurious warning about a ref counted issue.
Fixes: 4fb6eabf1037 ("drivers/base/memory.c: cache memory blocks in xarray to accelerate lookup")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/d44c63d78affe844f020dc02ad6af29abc448fc4.1650611702.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/memory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 7222ff9b5e05..084d67fd55cc 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c @@ -636,10 +636,9 @@ static int __add_memory_block(struct memory_block *memory) } ret = xa_err(xa_store(&memory_blocks, memory->dev.id, memory, GFP_KERNEL)); - if (ret) { - put_device(&memory->dev); + if (ret) device_unregister(&memory->dev); - } + return ret; } |