Upstream commit 394ca034bb is already present on msm-4.9 as Chromium kernel
backport commit 240e2d07c0. As a resolution, update definition from
MAX_USB_STRING_WITH_NULL_LEN to USB_MAX_STRING_WITH_NULL_LEN, while keeping use
of more secure strlcpy() to copy the USB string.
* android-4.9.263-q-merge: (26 commits)
Linux 4.9.263
genirq: Disable interrupts for force threaded handlers
ext4: fix potential error in ext4_do_update_inode
ext4: find old entry again if failed to rename whiteout
x86: Introduce TS_COMPAT_RESTART to fix get_nr_restart_syscall()
x86: Move TS_COMPAT back to asm/thread_info.h
kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data()
x86/ioapic: Ignore IRQ2 again
perf/x86/intel: Fix a crash caused by zero PEBS status
PCI: rpadlpar: Fix potential drc_name corruption in store functions
iio: adis16400: Fix an error code in adis16400_initial_setup()
usb: gadget: configfs: Fix KASAN use-after-free
USB: replace hardcode maximum usb string length by definition
scsi: lpfc: Fix some error codes in debugfs
net/qrtr: fix __netdev_alloc_skb call
sunrpc: fix refcount leak for rpc auth modules
svcrdma: disable timeouts on rdma backchannel
NFSD: Repair misuse of sv_lock in 5.10.16-rt30.
nvmet: don't check iosqes,iocqes for discovery controllers
btrfs: fix race when cloning extent buffer during rewind of an old root
...
Conflicts:
drivers/usb/gadget/configfs.c
Signed-off-by: Albert I <kras@raphielgang.org>
addca88d31