Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

rpmb: fix error path in rpmb_dev_register()

Until this patch was rpmb_dev_register() always freeing rdev in the error
path. However, past device_register() it must not do that since the memory
is now managed by the device even if it failed to register properly. So fix
this by doing a put_device() before returning the error code.

Fixes the smatch warning:
drivers/misc/rpmb-core.c:204 rpmb_dev_register()
warn: freeing device managed memory (leak): 'rdev'

Fixes: 1e9046e3a154 ("rpmb: add Replay Protected Memory Block (RPMB) subsystem")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Link: https://lore.kernel.org/r/20240902105803.2885544-1-jens.wiklander@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Jens Wiklander and committed by
Ulf Hansson
5854809b edd3183c

+4 -6
+4 -6
drivers/misc/rpmb-core.c
··· 187 187 rdev->dev.parent = dev; 188 188 189 189 ret = device_register(&rdev->dev); 190 - if (ret) 191 - goto err_id_remove; 190 + if (ret) { 191 + put_device(&rdev->dev); 192 + return ERR_PTR(ret); 193 + } 192 194 193 195 dev_dbg(&rdev->dev, "registered device\n"); 194 196 195 197 return rdev; 196 198 197 - err_id_remove: 198 - mutex_lock(&rpmb_mutex); 199 - ida_simple_remove(&rpmb_ida, rdev->id); 200 - mutex_unlock(&rpmb_mutex); 201 199 err_free_dev_id: 202 200 kfree(rdev->descr.dev_id); 203 201 err_free_rdev: