Messages in this thread Patch in this message | | | From | Wang Hui <> | Subject | [PATCH] hwtracing: stm: fix return value of error branch in stm_heartbeat_init | Date | Mon, 23 Nov 2020 15:14:38 +0000 |
| |
ret would be reset by stm_source_register_device after first loop, so we should reassign ret while allocation failed for stm_heartbeat[i].data.name
Reported-by: Hulk Robot <hulkci@huawei.com> Fixes: 119291853038 ("stm class: Add heartbeat stm source device") Signed-off-by: Wang Hui <john.wanghui@huawei.com> --- drivers/hwtracing/stm/heartbeat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/hwtracing/stm/heartbeat.c b/drivers/hwtracing/stm/heartbeat.c index 3e7df1c0477f..81d7b21d31ec 100644 --- a/drivers/hwtracing/stm/heartbeat.c +++ b/drivers/hwtracing/stm/heartbeat.c @@ -64,7 +64,7 @@ static void stm_heartbeat_unlink(struct stm_source_data *data) static int stm_heartbeat_init(void) { - int i, ret = -ENOMEM; + int i, ret; if (nr_devs < 0 || nr_devs > STM_HEARTBEAT_MAX) return -EINVAL; @@ -72,8 +72,10 @@ static int stm_heartbeat_init(void) for (i = 0; i < nr_devs; i++) { stm_heartbeat[i].data.name = kasprintf(GFP_KERNEL, "heartbeat.%d", i); - if (!stm_heartbeat[i].data.name) + if (!stm_heartbeat[i].data.name) { + ret = -ENOMEM; goto fail_unregister; + } stm_heartbeat[i].data.nr_chans = 1; stm_heartbeat[i].data.link = stm_heartbeat_link; -- 2.29.0
| |