Changeset dc5c303 in mainline for uspace/drv/nic

Timestamp:

2023-12-28T13:59:23Z (22 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

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

uspace/drv/nic/ar9271/wmi.c

@@ -230 +230 @@
         size_t buffer_size = header_size + command_length;
         void *buffer = malloc(buffer_size);
+        if (buffer == NULL) {
+                usb_log_error("Failed to allocate WMI message buffer (out of memory).\n");
+                return ENOMEM;
+        }
 
         if (command_buffer != NULL)
@@ -241 +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;
@@ -267 +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));
@@ -275 +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;