[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-701-ge01e180f6

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  e01e180f6248590348bad5c354c6b4e0cf1a956a (commit)
      from  4680d6ebdf142f9dd1acdc439d4e146ed36a290b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e01e180f6248590348bad5c354c6b4e0cf1a956a
Author: Marcus Nilsson <bra...@gm...>
Date:   Mon May 6 11:40:00 2024 +0200

    drivers/cmsis_dap: Fix buffer overflow in cmsis_dap_hid_open()
    
    Use mbstowcs() to get required length of wide character string and
    include space for terminating null wide character.
    
    Change-Id: I668de6f0acc9b3ec5aca033d870dd9ef354f9077
    Signed-off-by: Marcus Nilsson <bra...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8232
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/cmsis_dap_usb_hid.c b/src/jtag/drivers/cmsis_dap_usb_hid.c
index 98ccc3e38..aeec685b9 100644
--- a/src/jtag/drivers/cmsis_dap_usb_hid.c
+++ b/src/jtag/drivers/cmsis_dap_usb_hid.c
@@ -121,8 +121,12 @@ static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 				break;
 
 			if (cur_dev->serial_number) {
-				size_t len = (strlen(serial) + 1) * sizeof(wchar_t);
-				wchar_t *wserial = malloc(len);
+				size_t len = mbstowcs(NULL, serial, 0) + 1;
+				wchar_t *wserial = malloc(len * sizeof(wchar_t));
+				if (!wserial) {
+					LOG_ERROR("unable to allocate serial number buffer");
+					return ERROR_FAIL;
+				}
 				mbstowcs(wserial, serial, len);
 
 				if (wcscmp(wserial, cur_dev->serial_number) == 0) {

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/cmsis_dap_usb_hid.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository