Merge tag 'hardening-v6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / include / uapi / linux / usb / ch9.h

diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index 3ff98c7..62d3183 100644 (file)
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -376,7 +376,10 @@ struct usb_string_descriptor {
        __u8  bLength;
        __u8  bDescriptorType;
 
-       __le16 wData[1];                /* UTF-16LE encoded */
+       union {
+               __le16 legacy_padding;
+               __DECLARE_FLEX_ARRAY(__le16, wData);    /* UTF-16LE encoded */
+       };
 } __attribute__ ((packed));
 
 /* note that "string" zero is special, it holds language codes that