diff --git a/components/usb/hcd_dwc.c b/components/usb/hcd_dwc.c
index 7018ee5cbf..67241de1f5 100644
--- a/components/usb/hcd_dwc.c
+++ b/components/usb/hcd_dwc.c
@@ -1424,8 +1424,11 @@ static dma_buffer_block_t *buffer_block_alloc(usb_transfer_type_t type)
         break;
     }
     dma_buffer_block_t *buffer = calloc(1, sizeof(dma_buffer_block_t));
+    if (buffer == NULL) {
+        return NULL;
+    }
     void *xfer_desc_list = heap_caps_aligned_calloc(USB_DWC_QTD_LIST_MEM_ALIGN, desc_list_len, sizeof(usb_dwc_ll_dma_qtd_t), MALLOC_CAP_DMA);
-    if (buffer == NULL || xfer_desc_list == NULL) {
+    if (xfer_desc_list == NULL) {
         free(buffer);
         heap_caps_free(xfer_desc_list);
         return NULL;
diff --git a/components/usb/usb_phy.c b/components/usb/usb_phy.c
index cfaf90abd2..7ae5e5f382 100644
--- a/components/usb/usb_phy.c
+++ b/components/usb/usb_phy.c
@@ -340,8 +340,10 @@ esp_err_t usb_new_phy(const usb_phy_config_t *config, usb_phy_handle_t *handle_r
     return ESP_OK;
 
 cleanup:
-    free(phy_context->iopins);
-    free(phy_context);
+    if (phy_context) {
+        free(phy_context->iopins);
+        free(phy_context);
+    }
     if (p_phy_ctrl_obj->ref_count == 0) {
         free(p_phy_ctrl_obj);
         p_phy_ctrl_obj = NULL;