Skip to contentSkip to conversation

f_rockusb: Use NULL instead of 0 for pointers

PATCH New Andy Shevchenko 1 participant 3 messages Dec 3, 2020 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 f_rockusb: Use NULL instead of 0 for pointers

get_rkusb() mistakenly uses integers without cast. Convert them to proper type.

---
 drivers/usb/gadget/f_rockusb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/f_rockusb.c +2 -2
index 9ae02ae78c1e..9dd10f9e9aa1 100644
@@ -110,7 +110,7 @@ struct f_rockusb *get_rkusb(void)
 	if (!f_rkusb) {
 		f_rkusb = memalign(CONFIG_SYS_CACHELINE_SIZE, sizeof(*f_rkusb));
 		if (!f_rkusb)
-			return 0;
+			return NULL;
 
 		rockusb_func = f_rkusb;
 		memset(f_rkusb, 0, sizeof(*f_rkusb));
@@ -120,7 +120,7 @@ struct f_rockusb *get_rkusb(void)
 		f_rkusb->buf_head = memalign(CONFIG_SYS_CACHELINE_SIZE,
 					     RKUSB_BUF_SIZE);
 		if (!f_rkusb->buf_head)
-			return 0;
+			return NULL;
 
 		f_rkusb->buf = f_rkusb->buf_head;
 		memset(f_rkusb->buf_head, 0, RKUSB_BUF_SIZE);
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/3 f_rockusb: Avoid use-after-free in the global pointer variable

In case of usb_add_function() failure the error path has two issues:
- the potentially allocated structure isn't getting freed
- the global pointer variable is assigned to garbage

Fix the above mentioned issues by freeing memory and assigning NULL.

---
 drivers/usb/gadget/f_rockusb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/gadget/f_rockusb.c +2 -1
index 9dd10f9e9aa1..bd846ce9a77b 100644
@@ -309,8 +309,9 @@ static int rockusb_add(struct usb_configuration *c)
 
 	status = usb_add_function(c, &f_rkusb->usb_function);
 	if (status) {
+		free(f_rkusb->buf_head);
 		free(f_rkusb);
-		rockusb_func = f_rkusb;
+		rockusb_func = NULL;
 	}
 	return status;
 }
Signature · 1 line
2.29.2
#2 lore raw

PATCH 3/3 f_fastboot: Avoid use-after-free in the global pointer variable

In reply to Andy Shevchenko

In case of usb_add_function() failure the error path has an issue, i.e the global pointer variable is assigned to garbage

Fix the above mentioned issue by assigning pointer to NULL.

---
 drivers/usb/gadget/f_fastboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/f_fastboot.c +1 -1
index d1d087e12b2b..d0d865cf3d08 100644
@@ -315,7 +315,7 @@ static int fastboot_add(struct usb_configuration *c)
 	status = usb_add_function(c, &f_fb->usb_function);
 	if (status) {
 		free(f_fb);
-		fastboot_func = f_fb;
+		fastboot_func = NULL;
 	}
 
 	return status;
Signature · 1 line
2.29.2