[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20230801114107.15545-1-mirsad.todorovac@alu.unizg.hr>
Date: Tue, 1 Aug 2023 13:41:08 +0200
From: Mirsad Todorovac <mirsad.todorovac@....unizg.hr>
To: Mirsad Todorovac <mirsad.todorovac@....unizg.hr>,
Luis Chamberlain <mcgrof@...nel.org>,
linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Russ Weight <russell.h.weight@...el.com>,
Tianfei Zhang <tianfei.zhang@...el.com>,
Shuah Khan <shuah@...nel.org>,
Colin Ian King <colin.i.king@...il.com>,
Randy Dunlap <rdunlap@...radead.org>,
linux-kselftest@...r.kernel.org, stable@...r.kernel.org,
Dan Carpenter <error27@...il.com>,
Takashi Iwai <tiwai@...e.de>,
Dan Carpenter <dan.carpenter@...aro.org>
Subject: [PATCH v1 1/1] test_firmware: fix the memory leaks with the reqs buffer
[ commit be37bed754ed90b2655382f93f9724b3c1aae847 upstream ]
Dan Carpenter spotted that test_fw_config->reqs will be leaked if
trigger_batched_requests_store() is called two or more times.
The same appears with trigger_batched_requests_async_store().
This bug wasn't triggered by the tests, but observed by Dan's visual
inspection of the code.
The recommended workaround was to return -EBUSY if test_fw_config->reqs
is already allocated.
Fixes: c92316bf8e94 ("test_firmware: add batched firmware tests")
Cc: Luis Chamberlain <mcgrof@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Russ Weight <russell.h.weight@...el.com>
Cc: Tianfei Zhang <tianfei.zhang@...el.com>
Cc: Shuah Khan <shuah@...nel.org>
Cc: Colin Ian King <colin.i.king@...il.com>
Cc: Randy Dunlap <rdunlap@...radead.org>
Cc: linux-kselftest@...r.kernel.org
Cc: stable@...r.kernel.org # v4.14
Suggested-by: Dan Carpenter <error27@...il.com>
Suggested-by: Takashi Iwai <tiwai@...e.de>
Reviewed-by: Dan Carpenter <dan.carpenter@...aro.org>
Acked-by: Luis Chamberlain <mcgrof@...nel.org>
Link: https://lore.kernel.org/r/20230509084746.48259-2-mirsad.todorovac@alu.unizg.hr
Signed-off-by: Mirsad Todorovac <mirsad.todorovac@....unizg.hr>
[ This fix is applied against the 4.14 stable branch. There are no changes to the ]
[ fix in code when compared to the upstread, only the reformatting for backport. ]
---
lib/test_firmware.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 1c5e5246bf10..5318c5e18acf 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -621,6 +621,11 @@ static ssize_t trigger_batched_requests_store(struct device *dev,
mutex_lock(&test_fw_mutex);
+ if (test_fw_config->reqs) {
+ rc = -EBUSY;
+ goto out_bail;
+ }
+
test_fw_config->reqs = vzalloc(sizeof(struct test_batched_req) *
test_fw_config->num_requests * 2);
if (!test_fw_config->reqs) {
@@ -723,6 +728,11 @@ ssize_t trigger_batched_requests_async_store(struct device *dev,
mutex_lock(&test_fw_mutex);
+ if (test_fw_config->reqs) {
+ rc = -EBUSY;
+ goto out_bail;
+ }
+
test_fw_config->reqs = vzalloc(sizeof(struct test_batched_req) *
test_fw_config->num_requests * 2);
if (!test_fw_config->reqs) {
--
2.39.3
Powered by blists - more mailing lists