diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 1a1bd460205c..a480b0a9a238 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1963,6 +1963,8 @@ unknown:
 			break;
 
 		case USB_RECIP_ENDPOINT:
+			if (!cdev->config)
+				break;
 			endp = ((w_index & 0x80) >> 3) | (w_index & 0x0f);
 			list_for_each_entry(f, &cdev->config->functions, list) {
 				if (test_bit(endp, f->endpoints))
diff --git a/drivers/usb/pd/policy_engine.c b/drivers/usb/pd/policy_engine.c
index 1bb7082be8e6..82ae0b4fe135 100644
--- a/drivers/usb/pd/policy_engine.c
+++ b/drivers/usb/pd/policy_engine.c
@@ -925,7 +925,8 @@ int usbpd_send_vdm(struct usbpd *pd, u32 vdm_hdr, const u32 *vdos, int num_vdos)
 		return -ENOMEM;
 
 	vdm_tx->data[0] = vdm_hdr;
-	memcpy(&vdm_tx->data[1], vdos, num_vdos * sizeof(u32));
+	if (vdos && num_vdos)
+		memcpy(&vdm_tx->data[1], vdos, num_vdos * sizeof(u32));
 	vdm_tx->size = num_vdos + 1; /* include the header */
 
 	/* VDM will get sent in PE_SRC/SNK_READY state handling */
diff --git a/drivers/usb/pd/qpnp-pdphy.c b/drivers/usb/pd/qpnp-pdphy.c
index 8cf294306efd..5b5e6210a1bb 100644
--- a/drivers/usb/pd/qpnp-pdphy.c
+++ b/drivers/usb/pd/qpnp-pdphy.c
@@ -445,8 +445,10 @@ int pd_phy_write(u16 hdr, const u8 *data, size_t data_len,
 
 	dev_dbg(pdphy->dev, "%s: hdr %x frame type %d timeout %u\n",
 			__func__, hdr, type, timeout_ms);
-	print_hex_dump_debug("tx data obj:", DUMP_PREFIX_NONE, 32, 4,
-		data, data_len, false);
+
+	if (data && data_len)
+		print_hex_dump_debug("tx data obj:", DUMP_PREFIX_NONE, 32, 4,
+				data, data_len, false);
 
 	if (!pdphy) {
 		pr_err("%s: pdphy not found\n", __func__);
@@ -472,7 +474,7 @@ int pd_phy_write(u16 hdr, const u8 *data, size_t data_len,
 	if (ret)
 		return ret;
 
-	if (data_len) {
+	if (data && data_len) {
 		/* write data objects of SOP message */
 		ret = pdphy_bulk_reg_write(pdphy, USB_PDPHY_TX_BUFFER_DATA,
 				data, data_len);