Changeset 2298fc4 in mainline

Timestamp:

2023-10-22T13:56:55Z (7 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f5762c7

Parents:

a6625c98

git-author:

Vojtech Horky <vojtech.horky@…> (2023-07-24 16:18:23)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-10-22 13:56:55)

Message:

Prevent double-free

File:

• uspace/drv/nic/ar9271/wmi.c (modified) (3 diffs)

uspace/drv/nic/ar9271/wmi.c

@@ -245 +245 @@
             host2uint16_t_be(++htc_device->sequence_number);
 
-        /* Send message. */
+        /* Send message (buffer will not be needed afterwards regardless of result). */
         errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size,
             htc_device->endpoints.wmi_endpoint);
-        if (rc != EOK) {
-                free(buffer);
+        free(buffer);
+        if (rc != EOK) {
                 usb_log_error("Failed to send WMI message. Error: %s\n", str_error_name(rc));
                 return rc;
         }
-
-        free(buffer);
 
         bool clean_resp_buffer = false;
@@ -271 +269 @@
                     response_buffer_size, NULL);
                 if (rc != EOK) {
-                        free(buffer);
                         usb_log_error("Failed to receive WMI message response. "
                             "Error: %s\n", str_error_name(rc));
@@ -279 +276 @@
                 if (response_buffer_size < sizeof(htc_frame_header_t) +
                     sizeof(wmi_command_header_t)) {
-                        free(buffer);
                         usb_log_error("Corrupted response received.\n");
                         return EINVAL;