Skip to content

Commit be37bed

Browse files
Mirsad Goran Todorovacgregkh
authored andcommitted
test_firmware: fix a memory leak with reqs buffer
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 trigger 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: 7feebfa ("test_firmware: add support for request_firmware_into_buf") Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Russ Weight <russell.h.weight@intel.com> Cc: Tianfei Zhang <tianfei.zhang@intel.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: linux-kselftest@vger.kernel.org Cc: stable@vger.kernel.org # v5.4 Suggested-by: Dan Carpenter <error27@gmail.com> Suggested-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Acked-by: Luis Chamberlain <mcgrof@kernel.org> Link: https://lore.kernel.org/r/20230509084746.48259-2-mirsad.todorovac@alu.unizg.hr Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4acfe3d commit be37bed

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

lib/test_firmware.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -913,6 +913,11 @@ static ssize_t trigger_batched_requests_store(struct device *dev,
913913

914914
mutex_lock(&test_fw_mutex);
915915

916+
if (test_fw_config->reqs) {
917+
rc = -EBUSY;
918+
goto out_bail;
919+
}
920+
916921
test_fw_config->reqs =
917922
vzalloc(array3_size(sizeof(struct test_batched_req),
918923
test_fw_config->num_requests, 2));
@@ -1011,6 +1016,11 @@ ssize_t trigger_batched_requests_async_store(struct device *dev,
10111016

10121017
mutex_lock(&test_fw_mutex);
10131018

1019+
if (test_fw_config->reqs) {
1020+
rc = -EBUSY;
1021+
goto out_bail;
1022+
}
1023+
10141024
test_fw_config->reqs =
10151025
vzalloc(array3_size(sizeof(struct test_batched_req),
10161026
test_fw_config->num_requests, 2));

0 commit comments

Comments
 (0)