summaryrefslogtreecommitdiff
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2021-03-24 11:22:11 +0100
committerGreg Kroah-Hartman <gregkh@google.com>2021-03-24 11:22:11 +0100
commitff91fba478b0b7e2b81b13de25e9a226f1daf296 (patch)
tree328d3052ba44bdf361568b198782b3ba9dc81575 /include/uapi/linux
parent901297f61843b004aa3b39e28c53b89f586896d5 (diff)
parent4d422f6e1358d7eb9f493ec832e8cf0b8e6bc28d (diff)
Merge 4.4.263 into android-4.4-p
Changes in 4.4.263 ext4: handle error of ext4_setup_system_zone() on remount ext4: don't allow overlapping system zones ext4: check journal inode extents more carefully platform/chrome: cros_ec_dev - Fix security issue btrfs: fix race when cloning extent buffer during rewind of an old root NFSD: Repair misuse of sv_lock in 5.10.16-rt30. scsi: lpfc: Fix some error codes in debugfs USB: replace hardcode maximum usb string length by definition usb: gadget: configfs: Fix KASAN use-after-free PCI: rpadlpar: Fix potential drc_name corruption in store functions x86/ioapic: Ignore IRQ2 again ext4: find old entry again if failed to rename whiteout ext4: fix potential error in ext4_do_update_inode genirq: Disable interrupts for force threaded handlers Linux 4.4.263 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I2f08b8f294218dd5ef2df6f13ca83f43a8728a28
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/usb/ch9.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/ch9.h b/include/uapi/linux/usb/ch9.h
index ec6c8543732f..9ca4b43122d7 100644
--- a/include/uapi/linux/usb/ch9.h
+++ b/include/uapi/linux/usb/ch9.h
@@ -333,6 +333,9 @@ struct usb_config_descriptor {
/*-------------------------------------------------------------------------*/
+/* USB String descriptors can contain at most 126 characters. */
+#define USB_MAX_STRING_LEN 126
+
/* USB_DT_STRING: String descriptor */
struct usb_string_descriptor {
__u8 bLength;