Changeset e7dc3a4 in mainline for uspace/drv/nic/ar9271/wmi.c

Timestamp:

2023-07-24T16:22:54Z (17 months ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

ticket/834-toolchain-update

Children:

417e1f6

Parents:

d3d267b

git-author:

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

git-committer:

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

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;