executor/usb: use UTF16 encoding for default string

Also respond with lang ID when string #0 is requested.

1 files changed, 18 insertions, 5 deletions

diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go
index 9c70c3fa5..987dc0152 100644
--- a/pkg/csource/generated.go
+++ b/pkg/csource/generated.go
@@ -1936,7 +1936,15 @@ struct vusb_connect_descriptors {
 	struct vusb_connect_string_descriptor strs[0];
 } __attribute__((packed));
 
-static const char* default_string = "syzkaller";
+static const char default_string[] = {
+    8, USB_DT_STRING,
+    's', 0, 'y', 0, 'z', 0
+};
+
+static const char default_lang_id[] = {
+    4, USB_DT_STRING,
+    0x09, 0x04
+};
 
 static bool lookup_connect_response(struct vusb_connect_descriptors* descs, struct usb_device_index* index,
 				    struct usb_ctrlrequest* ctrl, char** response_data, uint32* response_length)
@@ -1958,13 +1966,18 @@ static bool lookup_connect_response(struct vusb_connect_descriptors* descs, stru
 				return true;
 			case USB_DT_STRING:
 				str_idx = (uint8)ctrl->wValue;
-				if (!descs || str_idx >= descs->strs_len) {
-					*response_data = (char*)default_string;
-					*response_length = strlen(default_string);
-				} else {
+				if (descs && str_idx < descs->strs_len) {
 					*response_data = descs->strs[str_idx].str;
 					*response_length = descs->strs[str_idx].len;
+					return true;
+				}
+				if (str_idx == 0) {
+					*response_data = (char*)&default_lang_id[0];
+					*response_length = default_lang_id[0];
+					return true;
 				}
+				*response_data = (char*)&default_string[0];
+				*response_length = default_string[0];
 				return true;
 			case USB_DT_BOS:
 				*response_data = descs->bos;