Skip to contentSkip to conversation

usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

PATCH New Lee Jones 1 participant 1 message Jul 5, 2024 USB

lore
Share & tools
lore

Lee Jones

author
#0 lore raw

PATCH 1/1 usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

Userspace provided string 's' could trivially have the length zero. Left unchecked this will firstly result in an OOB read in the form if (str[0 - 1] == '\n') followed closely by an OOB write in the form str[0 - 1] = '\0'`.

There is already a validating check to catch strings that are too long. Let's supply an additional check for invalid strings that are too short.

---
 drivers/usb/gadget/configfs.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/usb/gadget/configfs.c +3 -0
index ce3cfa1f36f51..0e7c1e947c0a0 100644
@@ -115,9 +115,12 @@ static int usb_string_copy(const char *s, char **s_copy)
 	int ret;
 	char *str;
 	char *copy = *s_copy;
+
 	ret = strlen(s);
 	if (ret > USB_MAX_STRING_LEN)
 		return -EOVERFLOW;
+	if (ret < 1)
+		return -EINVAL;
 
 	if (copy) {
 		str = copy;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog