aboutsummaryrefslogtreecommitdiff
path: root/include/uapi/linux/usb
Commit message (Collapse)AuthorAgeFilesLines
* USB: fix out-of-bounds in usb_set_configurationGreg Kroah-Hartman2018-05-021-0/+1
| | | | | | | | | | | | | | | | | | | | | Andrey Konovalov reported a possible out-of-bounds problem for a USB interface association descriptor. He writes: It seems there's no proper size check of a USB_DT_INTERFACE_ASSOCIATION descriptor. It's only checked that the size is >= 2 in usb_parse_configuration(), so find_iad() might do out-of-bounds access to intf_assoc->bInterfaceCount. And he's right, we don't check for crazy descriptors of this type very well, so resolve this problem. Yet another issue found by syzkaller... Change-Id: Ibe721523465bd15fc746bdfbf3e7aec908e688bb Git-commit: bd7a3fe770ebd8391d1c7d072ff88e9e76d063eb Git-repo: https://github.com/torvalds/linux/commit Reported-by: Andrey Konovalov <andreyknvl@google.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
* Merge "Merge 'android-3.18.105' (20653d9) into 'msm-3.18'"Linux Build Service Account2018-04-201-2/+2
|\
| * Merge 'android-3.18.105' (20653d9) into 'msm-3.18'Chetan C R2018-04-181-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with google common 'android-3.18.105' at 20653d927c66e3ce5f331dd41a8fd7beb248d56d into 'msm-3.18' * quic/tmp-20653d9: Revert "proc: make oom adjustment files user read-only" Revert "fixup! proc: make oom adjustment files user read-only" Linux 3.18.105 Revert "xhci: plat: Register shutdown for xhci_plat" ipv6: the entire IPv6 header chain must fit the first fragment net sched actions: fix dumping which requires several messages to user space r8169: fix setting driver_data after register_netdev ip6_tunnel: better validate user provided tunnel names vti6: better validate user provided tunnel names ip6_gre: better validate user provided tunnel names ipv6: sit: better validate user provided tunnel names ip_tunnel: better validate user provided tunnel names net: fool proof dev_valid_name() bonding: process the err returned by dev_set_allmulti properly in bond_enslave bonding: move dev_mc_sync after master_upper_dev_link in bond_enslave bonding: fix the err path for dev hwaddr sync in bond_enslave vhost: correctly remove wait queue during poll failure sky2: Increase D3 delay to sky2 stops working after suspend sctp: sctp_sockaddr_af must check minimal addr length for AF_INET6 sctp: do not leak kernel memory to user space pptp: remove a buggy dst release in pptp_connect() netlink: make sure nladdr has correct size in netlink_connect() net: fix possible out-of-bound read in skb_network_protocol() futex: Remove requirement for lock_page() in get_futex_key() random: use lockless method of accessing and updating f->reg_idx virtio_net: check return value of skb_to_sgvec in one more location virtio_net: check return value of skb_to_sgvec always rxrpc: check return value of skb_to_sgvec always ipsec: check return value of skb_to_sgvec always EDAC, mv64x60: Fix an error handling path tty: n_gsm: Allow ADM response in addition to UA for control dlci scsi: libsas: initialize sas_phy status according to response of DISCOVER scsi: libsas: fix error when getting phy events scsi: libsas: fix memory leak in sas_smp_get_phy_events() bcache: segregate flash only volume write streams bcache: stop writeback thread after detaching vxlan: dont migrate permanent fdb entries during learn ACPICA: Disassembler: Abort on an invalid/unknown AML opcode ACPICA: Events: Add runtime stub support for event APIs Bluetooth: Send HCI Set Event Mask Page 2 command only when needed iio: magnetometer: st_magn_spi: fix spi_device_id table sparc64: ldc abort during vds iso boot sctp: fix recursive locking warning in sctp_do_peeloff bnx2x: Allow vfs to disable txvlan offload xen: avoid type warning in xchg_xen_ulong perf tests: Decompress kernel module before objdump net: emac: fix reset timeout with AR8035 phy MIPS: kprobes: flush_insn_slot should flush only if probe initialised MIPS: mm: fixed mappings: correct initialisation perf/core: Correct event creation with PERF_FORMAT_GROUP e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails net: phy: avoid genphy_aneg_done() for PHYs without clause 22 support mceusb: sporadic RX truncation corruption fix cx25840: fix unchecked return values e1000e: fix race condition around skb_tstamp_tx() tags: honor COMPILED_SOURCE with apart output directory perf report: Ensure the perf DSO mapping matches what libdw sees net/mlx4: Fix the check in attaching steering rules skbuff: return -EMSGSIZE in skb_to_sgvec to prevent overflow bio-integrity: Do not allocate integrity context for bio w/o data Fix serial console on SNI RM400 machines drm/omap: fix tiled buffer stride calculations mISDN: Fix a sleep-in-atomic bug qlcnic: Fix a sleep-in-atomic bug in qlcnic_82xx_hw_write_wx_2M and qlcnic_82xx_hw_read_wx_2M perf trace: Add mmap alias for s390 powerpc/spufs: Fix coredump of SPU contexts KVM: SVM: do not zero out segment attributes if segment is unusable or not present net: freescale: fix potential null pointer dereference rtc: interface: Validate alarm-time before handling rollover arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE] ovl: filter trusted xattr for non-admin hdlcdrv: Fix divide by zero in hdlcdrv_ioctl wl1251: check return from call to wl1251_acx_arp_ip_filter vfb: fix video mode and line_length being set when loaded scsi: libiscsi: Allow sd_shutdown on bad transport l2tp: fix missing print session offset info net: llc: add lock_sock in llc_ui_bind to avoid a race condition KVM: nVMX: Fix handling of lmsw instruction bonding: Don't update slave->link until ready to commit net: move somaxconn init from sysctl code ext4: fix off-by-one on max nr_pages in ext4_find_unwritten_pgoff() fix race in drivers/char/random.c:get_reg() scsi: bnx2fc: fix race condition in bnx2fc_get_host_stats() netfilter: ctnetlink: fix incorrect nf_ct_put during hash resize libceph: NULL deref on crush_decode() error path block: fix an error code in add_partition() leds: pca955x: Correct I2C Functionality ray_cs: Avoid reading past end of buffer ARM: davinci: da8xx: Create DSP device only when assigned memory xfrm: fix state migration copy replay sequence numbers selftests/powerpc: Fix TM resched DSCR test with some compilers ath5k: fix memory leak on buf on failed eeprom read sh_eth: Use platform device for printing before register_netdev() net: x25: fix one potential use-after-free issue neighbour: update neigh timestamps iff update is effective ata: libahci: properly propagate return value of platform_get_irq() btrfs: fix incorrect error return ret being passed to mapping_set_error async_tx: Fix DMA_PREP_FENCE usage in do_async_gen_syndrome() ipv6: avoid dad-failures for addresses with NODAD ARM: dts: imx6qdl-wandboard: Fix audio channel swap x86/tsc: Provide 'tsc=unstable' boot parameter staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning PowerCap: Fix an error code in powercap_register_zone() SMB2: Fix share type handling vmxnet3: ensure that adapter is in proper state during force_close KVM: PPC: Book3S PR: Check copy_to/from_user return values netxen_nic: set rcode to the return status from the call to netxen_issue_cmd net: qca_spi: Fix alignment issues in rx path CIFS: silence lockdep splat in cifs_relock_file() net/mlx4_en: Avoid adding steering rules with invalid ring s390: move _text symbol to address higher than zero pidns: disable pid allocation if pid_ns_prepare_proc() is failed in alloc_pid() lockd: fix lockd shutdown race net: ethernet: ti: cpsw: adjust cpsw fifos depth for fullduplex flow control qlge: Avoid reading past end of buffer bna: Avoid reading past end of buffer mac80211: bail out from prep_connection() if a reconfig is ongoing af_key: Fix slab-out-of-bounds in pfkey_compile_policy. IB/srpt: Fix abort handling NFSv4.1: RECLAIM_COMPLETE must handle NFS4ERR_CONN_NOT_BOUND_TO_SESSION ANDROID: fuse: Add null terminator to path in canonical path to avoid issue ANDROID: sdcardfs: Fix sdcardfs to stop creating cases-sensitive duplicate entries. f2fs/fscrypt: updates to v4.17-rc1 Linux 3.18.104 net: fec: fix build error in fec driver proc: task_mmu: fix up merge issue with 3.18.103 Linux 3.18.103 Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()" md/raid10: reset the 'first' at the end of loop ARM: dts: dra7: Add power hold and power controller properties to palmas Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition vt: change SGR 21 to follow the standards Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list fs/proc: Stop trying to report thread stacks proc: revert /proc/<pid>/maps [stack:TID] annotation crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one crypto: ahash - Fix early termination in hash walk parport_pc: Add support for WCH CH382L PCI-E single parallel port card. media: usbtv: prevent double free in error case mei: remove dev_err message on an unsupported ioctl media: v4l2-compat-ioctl32: initialize a reserved field media: v4l2-compat-ioctl32: use compat_u64 for video standard media: media/v4l2-ctrls: volatiles should not generate CH_VALUE media: v4l2-ctrls: fix sparse warning media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors media: v4l2-compat-ioctl32.c: drop pr_info for unknown buffer type media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32 media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs media: v4l2-compat-ioctl32.c: fix ctrl_is_pointer media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32 media: v4l2-compat-ioctl32.c: avoid sizeof(type) media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32 media: v4l2-compat-ioctl32.c: fix the indentation media: v4l2-compat-ioctl32.c: add missing VIDIOC_PREPARE_BUF vb2: V4L2_BUF_FLAG_DONE is set after DQBUF media: v4l2-ioctl.c: don't copy back the result for -ENOTTY scsi: virtio_scsi: always read VPD pages for multiqueue too Bluetooth: Fix missing encryption refresh on Security Request netfilter: x_tables: add and use xt_check_proc_name netfilter: bridge: ebt_among: add more missing match size checks xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms() xfrm_user: uncoditionally validate esn replay attribute struct kprobes/x86: Fix to set RWX bits correctly before releasing trampoline xhci: Fix ring leak in failure path of xhci_alloc_virt_device() Revert "led: core: Fix brightness setting when setting delay_off=0" partitions/msdos: Unable to mount UFS 44bsd partitions perf/hwbp: Simplify the perf-hwbp code, fix documentation ALSA: pcm: potential uninitialized return values ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() mtd: jedec_probe: Fix crash in jedec_read_mfr() net: fec: Fix unbalanced PM runtime calls s390/qeth: on channel error, reject further cmd requests s390/qeth: lock read device while queueing next buffer s390/qeth: when thread completes, wake up all waiters s390/qeth: free netdevice when removing a card team: Fix double free in error path skbuff: Fix not waking applications when errors are enqueued net: Only honor ifindex in IP_PKTINFO if non-0 netlink: avoid a double skb free in genlmsg_mcast() net/iucv: Free memory obtained by kzalloc net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred l2tp: do not accept arbitrary sockets ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() dccp: check sk for closed state in dccp_sendmsg() Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" scsi: sg: don't return bogus Sg_requests kvm/x86: fix icebp instruction handling tty: vt: fix up tabstops properly can: cc770: Fix use after free in cc770_tx_interrupt() can: cc770: Fix queue stall & dropped RTR reply can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack staging: ncpfs: memory corruption in ncp_read_kernel() tracing: probeevent: Fix to support minus offset from symbol brcmfmac: fix P2P_DEVICE ethernet address generation drm: udl: Properly check framebuffer mmap offsets libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs libata: Enable queued TRIM for Samsung SSD 860 libata: disable LPM for Crucial BX100 SSD 500GB drive libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs libata: remove WARN() for DMA or PIO command without data libata: fix length validation of ATAPI-relayed SCSI commands ALSA: aloop: Fix access to not-yet-ready substream via cable ALSA: aloop: Sync stale timer before release ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" USB related changes were ignored as per the feedback from the USB team. Conflicts: drivers/media/v4l2-core/v4l2-compat-ioctl32.c drivers/usb/gadget/function/f_midi.c drivers/usb/host/xhci-mem.c include/linux/usb/gadget.h Change-Id: I3064d4027d96d5b8c1eea986a4335322ff4f1d63 Signed-off-by: Chetan C R <cravin@codeaurora.org>
| | * Merge 3.18.103 into android-3.18Greg Kroah-Hartman2018-04-081-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.103 ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unit ALSA: aloop: Sync stale timer before release ALSA: aloop: Fix access to not-yet-ready substream via cable libata: fix length validation of ATAPI-relayed SCSI commands libata: remove WARN() for DMA or PIO command without data libata: Apply NOLPM quirk to Crucial MX100 512GB SSDs libata: disable LPM for Crucial BX100 SSD 500GB drive libata: Enable queued TRIM for Samsung SSD 860 libata: Apply NOLPM quirk to Crucial M500 480 and 960GB SSDs libata: Make Crucial BX100 500GB LPM quirk apply to all firmware versions libata: Modify quirks for MX100 to limit NCQ_TRIM quirk to MU01 version drm: udl: Properly check framebuffer mmap offsets brcmfmac: fix P2P_DEVICE ethernet address generation tracing: probeevent: Fix to support minus offset from symbol staging: ncpfs: memory corruption in ncp_read_kernel() can: cc770: Fix stalls on rt-linux, remove redundant IRQ ack can: cc770: Fix queue stall & dropped RTR reply can: cc770: Fix use after free in cc770_tx_interrupt() tty: vt: fix up tabstops properly kvm/x86: fix icebp instruction handling scsi: sg: don't return bogus Sg_requests Revert "genirq: Use irqd_get_trigger_type to compare the trigger type for shared IRQs" dccp: check sk for closed state in dccp_sendmsg() ipv6: fix access to non-linear packet in ndisc_fill_redirect_hdr_option() l2tp: do not accept arbitrary sockets net: ethernet: arc: Fix a potential memory leak if an optional regulator is deferred net/iucv: Free memory obtained by kzalloc netlink: avoid a double skb free in genlmsg_mcast() net: Only honor ifindex in IP_PKTINFO if non-0 skbuff: Fix not waking applications when errors are enqueued team: Fix double free in error path s390/qeth: free netdevice when removing a card s390/qeth: when thread completes, wake up all waiters s390/qeth: lock read device while queueing next buffer s390/qeth: on channel error, reject further cmd requests net: fec: Fix unbalanced PM runtime calls mtd: jedec_probe: Fix crash in jedec_read_mfr() ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent() ALSA: pcm: potential uninitialized return values perf/hwbp: Simplify the perf-hwbp code, fix documentation partitions/msdos: Unable to mount UFS 44bsd partitions usb: gadget: define free_ep_req as universal function usb: gadget: change len to size_t on alloc_ep_req() usb: gadget: fix usb_ep_align_maybe endianness and new usb_ep_align usb: gadget: align buffer size when allocating for OUT endpoint usb: gadget: f_hid: fix: Prevent accessing released memory Revert "led: core: Fix brightness setting when setting delay_off=0" xhci: Fix ring leak in failure path of xhci_alloc_virt_device() kprobes/x86: Fix to set RWX bits correctly before releasing trampoline xfrm_user: uncoditionally validate esn replay attribute struct net: xfrm: use preempt-safe this_cpu_read() in ipcomp_alloc_tfms() xfrm: Refuse to insert 32 bit userspace socket policies on 64 bit systems netfilter: bridge: ebt_among: add more missing match size checks netfilter: x_tables: add and use xt_check_proc_name Bluetooth: Fix missing encryption refresh on Security Request scsi: virtio_scsi: always read VPD pages for multiqueue too media: v4l2-ioctl.c: don't copy back the result for -ENOTTY vb2: V4L2_BUF_FLAG_DONE is set after DQBUF media: v4l2-compat-ioctl32.c: add missing VIDIOC_PREPARE_BUF media: v4l2-compat-ioctl32.c: fix the indentation media: v4l2-compat-ioctl32.c: move 'helper' functions to __get/put_v4l2_format32 media: v4l2-compat-ioctl32.c: avoid sizeof(type) media: v4l2-compat-ioctl32.c: copy m.userptr in put_v4l2_plane32 media: v4l2-compat-ioctl32.c: fix ctrl_is_pointer media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs media: v4l2-compat-ioctl32: Copy v4l2_window->global_alpha media: v4l2-compat-ioctl32.c: copy clip list in put_v4l2_window32 media: v4l2-compat-ioctl32.c: drop pr_info for unknown buffer type media: v4l2-compat-ioctl32.c: don't copy back the result for certain errors media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic media: v4l2-ctrls: fix sparse warning media: media/v4l2-ctrls: volatiles should not generate CH_VALUE media: v4l2-compat-ioctl32: use compat_u64 for video standard media: v4l2-compat-ioctl32: initialize a reserved field USB: serial: ftdi_sio: add RT Systems VX-8 cable USB: serial: ftdi_sio: add support for Harman FirmwareHubEmulator USB: serial: cp210x: add ELDAT Easywave RX09 id mei: remove dev_err message on an unsupported ioctl media: usbtv: prevent double free in error case parport_pc: Add support for WCH CH382L PCI-E single parallel port card. crypto: ahash - Fix early termination in hash walk crypto: x86/cast5-avx - fix ECB encryption when long sg follows short one proc: revert /proc/<pid>/maps [stack:TID] annotation fs/proc: Stop trying to report thread stacks Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad vt: change SGR 21 to follow the standards Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition ARM: dts: dra7: Add power hold and power controller properties to palmas md/raid10: reset the 'first' at the end of loop Revert "PCI/MSI: Stop disabling MSI/MSI-X in pci_device_shutdown()" Revert "ARM: dts: omap3-n900: Fix the audio CODEC's reset pin" Revert "ARM: dts: am335x-pepper: Fix the audio CODEC's reset pin" Linux 3.18.103 Change-Id: Ia6ce64926f1680bd20d38fc457ee7d77e95e1b5e Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * ALSA: usb-audio: Fix parsing descriptor of UAC2 processing unitKirill Marinushkin2018-04-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a6618f4aedb2b60932d766bd82ae7ce866e842aa upstream. Currently, the offsets in the UAC2 processing unit descriptor are calculated incorrectly. It causes an issue when connecting the device which provides such a feature: ~~~~ [84126.724420] usb 1-1.3.1: invalid Processing Unit descriptor (id 18) ~~~~ After this patch is applied, the UAC2 processing unit inits w/o this error. Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") Signed-off-by: Kirill Marinushkin <k.marinushkin@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| | * | Merge 3.18.75 into android-3.18Greg Kroah-Hartman2017-10-121-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.75 usb: gadget: inode.c: fix unbalanced spin_lock in ep0_write USB: gadgetfs: Fix crash caused by inadequate synchronization USB: gadgetfs: fix copy_to_user while holding spinlock usb-storage: unusual_devs entry to fix write-access regression for Seagate external drives usb: renesas_usbhs: fix the BCLR setting condition for non-DCP pipe usb: renesas_usbhs: fix usbhsf_fifo_clear() for RX direction ALSA: usb-audio: Check out-of-bounds access by corrupted buffer descriptor usb: pci-quirks.c: Corrected timeout values used in handshake USB: dummy-hcd: fix connection failures (wrong speed) USB: dummy-hcd: fix infinite-loop resubmission bug USB: devio: Don't corrupt user memory USB: uas: fix bug in handling of alternate settings usb: Increase quirk delay for USB devices USB: fix out-of-bounds in usb_set_configuration xhci: fix finding correct bus_state structure for USB 3.1 hosts iio: ad_sigma_delta: Implement a dedicated reset function staging: iio: ad7192: Fix - use the dedicated reset function avoiding dma from stack. iio: core: Return error for failed read_reg iio: ad7793: Fix the serial interface reset iio: adc: mcp320x: Fix oops on module unload uwb: properly check kthread_run return value uwb: ensure that endpoint is interrupt lsm: fix smack_inode_removexattr and xattr_getsecurity memleak ALSA: usx2y: Suppress kernel warning at page allocation failures driver core: platform: Don't read past the end of "driver_override" buffer HID: i2c-hid: allocate hid buffers for real worst case drm/i915/bios: ignore HDMI on port A ext4: only call ext4_truncate when size <= isize fs/super.c: fix race between freeze_super() and thaw_super() ext4: fix data corruption for mmap writes ext4: Don't clear SGID when inheriting ACLs ext4: validate s_first_meta_bg at mount time ext4: fix fencepost in s_first_meta_bg validation Linux 3.18.75 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | | * USB: fix out-of-bounds in usb_set_configurationGreg Kroah-Hartman2017-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit bd7a3fe770ebd8391d1c7d072ff88e9e76d063eb upstream. Andrey Konovalov reported a possible out-of-bounds problem for a USB interface association descriptor. He writes: It seems there's no proper size check of a USB_DT_INTERFACE_ASSOCIATION descriptor. It's only checked that the size is >= 2 in usb_parse_configuration(), so find_iad() might do out-of-bounds access to intf_assoc->bInterfaceCount. And he's right, we don't check for crazy descriptors of this type very well, so resolve this problem. Yet another issue found by syzkaller... Reported-by: Andrey Konovalov <andreyknvl@google.com> Tested-by: Andrey Konovalov <andreyknvl@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | | u_ctrl_qti: Increase MAX_QTI_PKT_SIZE to 8KVijayavardhan Vennapusa2018-04-161-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | increase MAX_QTI_PKT_SIZE to 8KB to handle QMI messages of bigger length of 8KB. Change-Id: I479794c9563ae89b9062b75031b6cdc739a0f620 Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
* | | Merge tag 'google-common-android-3.18' into 'msm-3.18'Imran Khan2017-08-111-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google-common-android-3.18 v3.18 * origin/tmp-ba420f35a: ext4: ext4_encrypted_zeroout: fix merge error with duplicated call ANDROID: Fix missing header file for get_cmdline() call perf/core: Fix concurrent sys_perf_event_open() vs. 'move_group' race f2fs, block_dump: give WRITE direction to submit_bio FROMLIST: f2fs: add ioctl to expose current features FROMLIST: f2fs: don't give partially written atomic data from process crash FROMLIST: f2fs: give a try to do atomic write in -ENOMEM case ANDROID: f2fs: fix location fo android tracepoint f2fs: avoid cpu lockup f2fs: include seq_file.h for sysfs.c f2fs: remove extra inode_unlock() in error path fscrypt: add support for AES-128-CBC fscrypt: inline fscrypt_free_filename() f2fs: enable f2fs_migrate_page f2fs: make more close to v4.13-rc1 f2fs: support plain user/group quota f2fs: avoid deadlock caused by lock order of page and lock_op f2fs: use spin_{,un}lock_irq{save,restore} f2fs: relax migratepage for atomic written page f2fs: don't count inode block in in-memory inode.i_blocks Revert "f2fs: fix to clean previous mount option when remount_fs" f2fs: do not set LOST_PINO for renamed dir f2fs: do not set LOST_PINO for newly created dir f2fs: skip ->writepages for {mete,node}_inode during recovery f2fs: introduce __check_sit_bitmap f2fs: stop gc/discard thread in prior during umount f2fs: introduce reserved_blocks in sysfs f2fs: avoid redundant f2fs_flush after remount f2fs: report # of free inodes more precisely f2fs: add ioctl to do gc with target block address f2fs: don't need to check encrypted inode for partial truncation f2fs: measure inode.i_blocks as generic filesystem f2fs: set CP_TRIMMED_FLAG correctly f2fs: require key for truncate(2) of encrypted file f2fs: move sysfs code from super.c to fs/f2fs/sysfs.c f2fs: clean up sysfs codes f2fs: fix wrong error number of fill_super f2fs: fix to show injection rate in ->show_options f2fs: Fix a return value in case of error in 'f2fs_fill_super' f2fs: use proper variable name f2fs: fix to avoid panic when encountering corrupt node f2fs: don't track newly allocated nat entry in list f2fs: add f2fs_bug_on in __remove_discard_cmd f2fs: introduce __wait_one_discard_bio f2fs: dax: fix races between page faults and truncating pages f2fs: simplify the way of calulating next nat address f2fs: fix a panic caused by NULL flush_cmd_control f2fs: remove the unnecessary cast for PTR_ERR f2fs: remove false-positive bug_on f2fs: Do not issue small discards in LFS mode f2fs: don't bother checking for encryption key in ->write_iter() f2fs: don't bother checking for encryption key in ->mmap() f2fs: wait discard IO completion without cmd_lock held f2fs: wake up all waiters in f2fs_submit_discard_endio f2fs: show more info if fail to issue discard f2fs: introduce io_list for serialize data/node IOs f2fs: split wio_mutex f2fs: combine huge num of discard rb tree consistence checks f2fs: fix a bug caused by NULL extent tree f2fs: try to freeze in gc and discard threads f2fs: add a new function get_ssr_cost f2fs: declare load_free_nid_bitmap static f2fs: avoid f2fs_lock_op for IPU writes f2fs: split bio cache f2fs: use fio instead of multiple parameters f2fs: remove unnecessary read cases in merged IO flow f2fs: use f2fs_submit_page_bio for ra_meta_pages f2fs: make sure f2fs_gc returns consistent errno f2fs: load inode's flag from disk uid_sys_stats: log task io with a debug flag ANDROID: binder: Don't BUG_ON(!spin_is_locked()). Linux 3.18.63 MIPS: Send SIGILL for BPOSGE32 in `__compute_return_epc_for_insn' alarmtimer: don't rate limit one-shot timers tracing: Fix kmemleak in instance_rmdir spmi: Include OF based modalias in device uevent of: device: Export of_device_{get_modalias, uvent_modalias} to modules KVM: PPC: Book3S HV: Context-switch EBB registers properly drm/mst: Avoid processing partially received up/down message transactions drm/mst: Avoid dereferencing a NULL mstb in drm_dp_mst_handle_up_req() drm/mst: Fix error handling during MST sideband message reception staging: rtl8188eu: add TL-WN722N v2 support Revert "perf/core: Drop kernel samples even though :u is specified" perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target target: Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce udf: Fix deadlock between writeback and udf_setsize() NFS: only invalidate dentrys that are clearly invalid. Input: i8042 - fix crash at boot time MIPS: math-emu: Prevent wrong ISA mode instruction emulation MIPS: Fix unaligned PC interpretation in `compute_return_epc' MIPS: Actually decode JALX in `__compute_return_epc_for_insn' MIPS: Save static registers before sysmips x86/acpi: Prevent out of bound access caused by broken ACPI tables MIPS: Negate error syscall return in trace MIPS: Fix mips_atomic_set() with EVA MIPS: Fix mips_atomic_set() retry condition vfio: New external user group/file match vfio: Fix group release deadlock f2fs: Don't clear SGID when inheriting ACLs drm/radeon/ci: disable mclk switching for high refresh rates (v2) s390/syscalls: Fix out of bounds arguments access Raid5 should update rdev->sectors after reshape md: don't use flush_signals in userspace processes PCI/PM: Restore the status of PCI devices across hibernation af_key: Fix sadb_x_ipsecrequest parsing powerpc/asm: Mark cr0 as clobbered in mftb() powerpc: Fix emulation of mfocrf in emulate_step() powerpc: Fix emulation of mcrf in emulate_step() powerpc/64: Fix atomic64_inc_not_zero() to return an int scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails. PM / Domains: Fix unsafe iteration over modified list of domain providers PM / Domains: Fix unsafe iteration over modified list of device links ASoC: compress: Derive substream from stream based on direction Bluetooth: use constant time memory comparison for secret values NFC: Add sockaddr length checks before accessing sa_family in bind handlers stddef.h: move offsetofend inside #ifndef/#endif guard, neaten include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header nfc: Fix the sockaddr length sanitization in llcp_sock_connect nfc: Ensure presence of required attributes in the activate_target handler NFC: fix broken device allocation ath9k: fix tx99 bus error ath9k: fix tx99 use after free CIFS: Fix handle_cancelled_mid callback initialization ir-core: fix gcc-7 warning on bool arithmetic x86/rtc: Remove duplicate const specifier kvm: x86: memset whole irq_eoi disable new gcc-7.1.1 warnings for now android: configs: Remove CONFIG_USB_G_ANDROID from base. UPSTREAM: af_key: Fix sadb_x_ipsecrequest parsing Revert "proc: smaps: Allow smaps access for CAP_SYS_RESOURCE" Linux 3.18.62 tracing: Use SOFTIRQ_OFFSET for softirq dectection for more accurate results PM / QoS: return -EINVAL for bogus strings crypto: caam - fix signals handling crypto: sha1-ssse3 - Disable avx2 crypto: atmel - only treat EBUSY as transient if backlog crypto: talitos - Extend max key length for SHA384/512-HMAC and AEAD mm: fix overflow check in expand_upwards() vt: fix unchecked __put_user() in tioclinux ioctls exec: Limit arg stack to at most 75% of _STK_LIM checkpatch: silence perl 5.26.0 unescaped left brace warnings fs/dcache.c: fix spin lockup issue on nlru->lock kernel/extable.c: mark core_kernel_text notrace tools/lib/lockdep: Reduce MAX_LOCK_DEPTH to avoid overflowing lock_chain/: Depth parisc/mm: Ensure IRQs are off in switch_mm() parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs parisc: use compat_sys_keyctl() parisc: Report SIGSEGV instead of SIGBUS when running out of stack irqchip/gic-v3: Fix out-of-bound access in gic_set_affinity cfg80211: Check if PMKID attribute is of expected size cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE brcmfmac: fix possible buffer overflow in brcmf_cfg80211_mgmt_tx() ipv6: dad: don't remove dynamic addresses if link is down net: prevent sign extension in dev_get_stats() tcp: reset sk_rx_dst in tcp_disconnect() ipv6: avoid unregistering inet6_dev for loopback ANDROID: android-verity: mark dev as rw for linear target ANDROID: sdcardfs: Remove unnecessary lock uid_sys_stats: make hash_table static ANDROID: binder: don't check prio permissions on restore. Add BINDER_GET_NODE_DEBUG_INFO ioctl ANDROID: binder: add RT inheritance flag to node. ANDROID: binder: improve priority inheritance. ANDROID: binder: add min sched_policy to node. ANDROID: binder: add support for RT prio inheritance. ANDROID: binder: push new transactions to waiting threads. ANDROID: binder: remove proc waitqueue FROMLIST: binder: remove global binder lock FROMLIST: binder: fix death race conditions FROMLIST: binder: protect against stale pointers in print_binder_transaction FROMLIST: binder: protect binder_ref with outer lock FROMLIST: binder: use inner lock to protect thread accounting FROMLIST: binder: protect transaction_stack with inner lock. FROMLIST: binder: protect proc->threads with inner_lock FROMLIST: binder: protect proc->nodes with inner lock FROMLIST: binder: add spinlock to protect binder_node FROMLIST: binder: add spinlocks to protect todo lists FROMLIST: binder: use inner lock to sync work dq and node counts FROMLIST: binder: introduce locking helper functions FROMLIST: binder: use node->tmp_refs to ensure node safety FROMLIST: binder: refactor binder ref inc/dec for thread safety FROMLIST: binder: make sure accesses to proc/thread are safe FROMLIST: binder: make sure target_node has strong ref FROMLIST: binder: guarantee txn complete / errors delivered in-order FROMLIST: binder: refactor binder_pop_transaction FROMLIST: binder: use atomic for transaction_log index FROMLIST: binder: add more debug info when allocation fails. FROMLIST: binder: protect against two threads freeing buffer FROMLIST: binder: remove dead code in binder_get_ref_for_node FROMLIST: binder: don't modify thread->looper from other threads FROMLIST: binder: avoid race conditions when enqueuing txn FROMLIST: binder: refactor queue management in binder_thread_read FROMLIST: binder: add log information for binder transaction failures FROMLIST: binder: make binder_last_id an atomic FROMLIST: binder: change binder_stats to atomics FROMLIST: binder: add protection for non-perf cases FROMLIST: binder: remove binder_debug_no_lock mechanism FROMLIST: binder: move binder_alloc to separate file FROMLIST: binder: separate out binder_alloc functions FROMLIST: binder: remove unneeded cleanup code FROMLIST: binder: separate binder allocator structure from binder proc FROMLIST: binder: Use wake up hint for synchronous transactions. Revert "android: binder: move global binder state into context struct." ANDROID: binder: check set_context_mgr permission on time. Linux 3.18.61 saa7134: fix warm Medion 7134 EEPROM read staging: comedi: fix clean-up of comedi_class in comedi_init() staging: vt6556: vnt_start Fix missing call to vnt_key_init_table. md: fix super_offset endianness in super_1_rdev_size_change mqueue: fix a use-after-free in sys_mq_notify() KEYS: Fix an error code in request_master_key() pinctrl: sh-pfc: Update info pointer after SoC-specific init pinctrl: mxs: atomically switch mux and drive strength config tracing/kprobes: Allow to create probe with a module name starting with a digit bgmac: reset & enable Ethernet core before using it bgmac: fix device initialization on Northstar SoCs (condition typo) MIPS: UAPI: Ignore __arch_swab{16,32,64} when using MIPS16 driver core: platform: fix race condition with driver_override ANDROID: android-base.cfg: remove CONFIG_CGROUP_DEBUG ANDROID: sdcardfs: use mount_nodev and fix a issue in sdcardfs_kill_sb Linux 3.18.60 KVM: nVMX: Fix exception injection KVM: x86: zero base3 of unusable segments cpufreq: s3c2416: double free on driver init error path iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid() iommu/vt-d: Don't over-free page table directories ARM: 8685/1: ensure memblock-limit is pmd-aligned watchdog: bcm281xx: Fix use of uninitialized spinlock. xfrm: Oops on error in pfkey_msg2xfrm_state() xfrm: NULL dereference on allocation failure xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only net: korina: Fix NAPI versus resources freeing ARM: dts: BCM5301X: Correct GIC_PPI interrupt flags mm: numa: avoid waiting on freed migrated pages sysctl: enable strict writes drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr ALSA: hda - set input_path bitmap to zero after moving it to new place MIPS: Fix IRQ tracing & lockdep when rescheduling MIPS: pm-cps: Drop manual cache-line alignment of ready_count MIPS: Avoid accidental raw backtrace arm64: cpuinfo: Missing NULL terminator in compat_hwcap_str net: 8021q: Fix one possible panic caused by BUG_ON in free_netdev decnet: always not take dst->__refcnt when inserting dst into hash table ipv6: fix calling in6_ifa_hold incorrectly for dad work igmp: add a missing spin_lock_init() igmp: acquire pmc lock for ip_mc_clear_src() net: caif: Fix a sleep-in-atomic bug in cfpkt_create_pfx Fix an intermittent pr_emerg warning about lo becoming free. decnet: dn_rtmsg: Improve input length sanitization in dnrmg_receive_user_skb net: don't call strlen on non-terminated string in dev_set_alias() netfilter: synproxy: fix conntrackd interaction netfilter: xt_TCPMSS: add more sanity tests on tcph->doff ipv6: release dst on error in ip6_dst_lookup_tail xhci: fix deadlock at host remove by running watchdog correctly UPSTREAM: selinux: enable genfscon labeling for tracefs Linux 3.18.59 mac80211/wpa: use constant time memory comparison for MACs net: phy: fix marvell phy status reading powerpc/slb: Force a full SLB flush when we insert for a bad EA mtd: spi-nor: fix spansion quad enable of: Add check to of_scan_flat_dt() before accessing initial_boot_params rxrpc: Fix several cases where a padded len isn't checked in ticket decode target: Fix kref->refcount underflow in transport_cmd_finish_abort Input: i8042 - add Fujitsu Lifebook AH544 to notimeout list powerpc/kprobes: Pause function_graph tracing during jprobes handling signal: Only reschedule timers on signals timers have sent CIFS: Improve readdir verbosity KVM: PPC: Book3S HV: Preserve userspace HTM state properly lib/cmdline.c: fix get_options() overflow while parsing ranges autofs: sanity check status reported with AUTOFS_DEV_IOCTL_FAIL fs/exec.c: account for argv/envp pointers UPSTREAM: packet: fix races in fanout_add() ANDROID: squashfs: Fix endianness issue ANDROID: squashfs: Fix signed division issue Linux 3.18.58 mm: fix new crash in unmapped_area_topdown() Allow stack to grow up to address space limit mm: larger stack guard gap, between vmas alarmtimer: Rate limit periodic intervals genirq: Release resources in __setup_irq() error path swap: cond_resched in swap_cgroup_prepare() mm/memory-failure.c: use compound_head() flags for huge pages usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR() iio: proximity: as3935: recalibrate RCO after resume staging: rtl8188eu: prevent an underflow in rtw_check_beacon_data() mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init() serial: efm32: Fix parity management in 'efm32_uart_console_get_options()' mac80211: don't look at the PM bit of BAR frames vb2: Fix an off by one error in 'vb2_plane_vaddr' cpufreq: conservative: Allow down_threshold to take values from 1 to 10 can: gs_usb: fix memory leak in gs_cmd_reset() configfs: Fix race between create_link and configfs_rmdir sparc64: make string buffers large enough log2: make order_base_2() behave correctly on const input value zero ipv6: Inhibit IPv4-mapped src address on the wire. ipv6: Handle IPv4-mapped src to in6addr_any dst. net: xilinx_emaclite: fix receive buffer overflow net: xilinx_emaclite: fix freezes due to unordered I/O Call echo service immediately after socket reconnect partitions/msdos: FreeBSD UFS2 file systems are not recognized s390/vmem: fix identity mapping BACKPORT: ext4: fix data exposure after a crash BACKPORT: ipv6/dccp: do not inherit ipv6_mc_list from parent ANDROID: sdcardfs: remove dead function open_flags_to_access_mode() ANDROID: android-base.cfg: split out arm64-specific configs fscrypt,f2fs: catch up fscrypt and f2fs-stable/v3.18 having v4.12-rc1 Linux 3.18.57 ALSA: timer: Fix race between read and ioctl mlx5: stop including <asm-generic/kmap_types.h> arm64: ensure extension of smp_store_release value usercopy: Adjust tests to deal with SMAP/PAN RDMA/qib,hfi1: Fix MR reference count leak on write with immediate arm64: entry: improve data abort handling of tagged pointers arm64: hw_breakpoint: fix watchpoint matching for tagged pointers serial: sh-sci: Fix panic when serial console and DMA are enabled drivers: char: mem: Fix wraparound check to allow mappings up to the end ASoC: Fix use-after-free at card unregistration ALSA: timer: Fix missing queue indices reset at SNDRV_TIMER_IOCTL_SELECT drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl() drm/vmwgfx: Handle vmalloc() failure in vmw_local_fifo_reserve() perf/core: Drop kernel samples even though :u is specified powerpc/numa: Fix percpu allocations to be NUMA aware powerpc/eeh: Avoid use after free in eeh_handle_special_event() scsi: qla2xxx: don't disable a not previously enabled PCI device btrfs: fix memory leak in update_space_info failure path btrfs: use correct types for page indices in btrfs_page_exists_in_range stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms random: properly align get_random_int_hash drivers: char: random: add get_random_long() iio: proximity: as3935: fix AS3935_INT mask staging/lustre/lov: remove set_fs() call from lov_getstripe() ext4: keep existing extra fields when inode expands ext4: fix SEEK_HOLE dmaengine: ep93xx: Always start from BASE0 arm: KVM: Allow unaligned accesses at HYP KVM: cpuid: Fix read/write out-of-bounds vulnerability in cpuid emulation kvm: async_pf: fix rcu_irq_enter() with irqs enabled nfsd4: fix null dereference on replay crypto: gcm - wait for crypto op not signal safe KEYS: fix freeing uninitialized memory in key_update() KEYS: fix dereferencing NULL payload with nonzero length serial: ifx6x60: fix use-after-free on module unload net: ethoc: enable NAPI before poll may be scheduled net: ping: do not abuse udp_poll() ipv6: Fix leak in ipv6_gso_segment(). tcp: disallow cwnd undo when switching congestion control cxgb4: avoid enabling napi twice to the same queue ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt() bnx2x: Fix Multi-Cos ANDROID: sdcardfs: d_splice_alias can return error values UPSTREAM: merge d_materialise_unique() into d_splice_alias() tracing: fix race condition reading saved tgids Linux 3.18.56 xfs: fix unaligned access in xfs_btree_visit_blocks xfs: bad assertion for delalloc an extent that start at i_size xfs: fix indlen accounting error on partial delalloc conversion xfs: fix up quotacheck buffer list error handling xfs: prevent multi-fsb dir readahead from reading random blocks xfs: handle array index overrun in xfs_dir2_leaf_readbuf() xfs: fix over-copying of getbmap parameters from userspace xfs: fix off-by-one on max nr_pages in xfs_find_get_desired_pgoff() xfs: Fix missed holes in SEEK_HOLE implementation mlock: fix mlock count can not decrease in race condition mm/migrate: fix refcount handling when !hugepage_migration_supported() drm/gma500/psb: Actually use VBT mode when it is found slub/memcg: cure the brainless abuse of sysfs attributes ALSA: hda - apply STAC_9200_DELL_M22 quirk for Dell Latitude D430 pcmcia: remove left-over %Z format drm/radeon/ci: disable mclk switching for high refresh rates (v2) i2c: i2c-tiny-usb: fix buffer not being DMA capable sctp: fix ICMP processing if skb is non-linear tcp: avoid fastopen API to be used on AF_UNSPEC ipv6: fix out of bound writes in __ip6_append_data() qmi_wwan: add another Lenovo EM74xx device ID ipv6: Check ip6_find_1stfragopt() return value properly. ipv6: Prevent overrun when parsing v6 header options tcp: eliminate negative reordering in tcp_clean_rtx_queue sctp: do not inherit ipv6_{mc|ac|fl}_list from parent sctp: fix src address selection if using secondary addresses for ipv6 tcp: avoid fragmenting peculiar skbs in SACK s390/qeth: avoid null pointer dereference on OSN s390/qeth: unbreak OSM and OSN support s390/qeth: handle sysfs error during initialization dccp/tcp: do not inherit mc_list from parent netem: fix skb_orphan_partial() Revert "stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms" android: base-cfg: disable CONFIG_NFSD and CONFIG_NFS_FS BACKPORT: f2fs: sanity check size of nat and sit cache Revert "FROMLIST: f2fs: sanity check size of nat and sit cache" FROMLIST: f2fs: sanity check size of nat and sit cache FROMLIST: f2fs: sanity check checkpoint segno and blkoff ANDROID: hid: uhid: implement refcount for open and close ANDROID: mnt: Fix next_descendent UPSTREAM: fscrypt: avoid collisions when presenting long encrypted filenames UPSTREAM: fscrypt: fix context consistency check when key(s) unavailable UPSTREAM: ext4 crypto: fix some error handling UPSTREAM: ext4 crypto: don't let data integrity writebacks fail with ENOMEM UPSTREAM: ext4/fscrypto: avoid RCU lookup in d_revalidate UPSTREAM: ext4 crypto: use dget_parent() in ext4_d_revalidate() UPSTREAM: ext4 crypto: revalidate dentry after adding or removing the key UPSTREAM: fscrypt: remove broken support for detecting keyring key revocation UPSTREAM: fscrypto: lock inode while setting encryption policy UPSTREAM: fscrypt: fix renaming and linking special files UPSTREAM: fscrypto: require write access to mount to set encryption policy UPSTREAM: fscrypto: add authorization check for setting encryption policy UPSTREAM: ext4: enforce online defrag restriction for encrypted files UPSTREAM: ext4 crypto: add missing locking for keyring_key access Linux 3.18.55 drivers: char: mem: Check for address space wraparound with mmap() PCI: Freeze PME scan before suspending devices PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms tracing/kprobes: Enforce kprobes teardown after testing osf_wait4(): fix infoleak uwb: fix device quirk on big-endian hosts stackprotector: Increase the per-task stack canary's random range from 32 bits to 64 bits on 64-bit platforms metag/uaccess: Check access_ok in strncpy_from_user metag/uaccess: Fix access_ok() mm/huge_memory.c: respect FOLL_FORCE/FOLL_COW for thp xc2028: Fix use-after-free bug properly arm64: documentation: document tagged pointer stack constraints arm64: uaccess: ensure extension of access_ok() addr ARM: dts: at91: sama5d3_xplained: not all ADC channels are available ARM: dts: at91: sama5d3_xplained: fix ADC vref powerpc/pseries: Fix of_node_put() underflow during DLPAR remove cx231xx-audio: fix NULL-deref at probe cx231xx-cards: fix NULL-deref at probe zr364xx: enforce minimum size when reading header dib0700: fix NULL-deref at probe s5p-mfc: Fix unbalanced call to clock management gspca: konica: add missing endpoint sanity check iio: proximity: as3935: fix as3935_write ipx: call ipxitf_put() in ioctl error path tty: Prevent ldisc drivers from re-using stale tty fields pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes iio: dac: ad7303: fix channel description of: fdt: add missing allocation-failure check of: fix sparse warning in of_pci_range_parser_one cdc-acm: fix possible invalid access when processing notification ath9k_htc: fix NULL-deref at probe regulator: tps65023: Fix inverted core enable logic. ima: accept previously set IMA_NEW_FILE mwifiex: pcie: fix cmd_buf use-after-free in remove/reset dm space map disk: fix some book keeping in the disk space map dm thin metadata: call precommit before saving the roots dm bufio: avoid a possible ABBA deadlock dm btree: fix for dm_btree_find_lowest_key() char: lp: fix possible integer overflow in lp_setup() watchdog: pcwd_usb: fix NULL-deref at probe UPSTREAM: arm: perf: Fix callchain parse error with kernel tracepoint events UPSTREAM: ARM: 8170/1: Add global named register current_stack_pointer for ARM UPSTREAM: arm64: perf: Fix callchain parse error with kernel tracepoint events uid_sys_stats: defer io stats calulation for dead tasks ANDROID: sdcardfs: Check for NULL in revalidate Linux 3.18.54 ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt ALSA: timer: Fix leak in events via snd_timer_user_ccallback ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS ALSA: timer: Fix race among timer ioctls ALSA: seq: Fix race at timer setup and close cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind HID: core: prevent out-of-bound readings ppp: defer netns reference release for ppp channel af_unix: Guard against other == sk in unix_dgram_sendmsg ipv6: sctp: fix lockdep splat in sctp_v6_get_dst() ipv6: sctp: add rcu protection around np->opt sg: Fix double-free when drives detach during SG_IO ext4: fix potential use after free in __ext4_journal_stop KEYS: Fix ASN.1 indefinite length object parsing ASN.1: Fix non-match detection failure on data overrun perf: Fix race in swevent hash arm64: perf: reject groups spanning multiple HW PMUs perf: Fix event->ctx locking arm64: make sys_call_table const Bluetooth: Fix user channel for 32bit userspace on 64bit kernel serial: omap: suspend device on probe errors serial: omap: fix runtime-pm handling on unbind md/raid1: avoid reusing a resync bio after error handling. padata: free correct variable CIFS: add misssing SFM mapping for doublequote CIFS: fix mapping of SFM_SPACE and SFM_PERIOD SMB3: Work around mount failure when using SMB3 dialect to Macs Set unicode flag on cifs echo request to avoid Mac error fs/block_dev: always invalidate cleancache in invalidate_bdev() ceph: fix memory leak in __ceph_setxattr() fs/xattr.c: zero out memory copied to userspace in getxattr IB/mlx4: Fix ib device initialization error flow IB/IPoIB: ibX: failed to create mcg debug file dm era: save spacemap metadata root after the pre-commit um: Fix PTRACE_POKEUSER on x86_64 x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup staging: comedi: jr3_pci: cope with jiffies wraparound staging: comedi: jr3_pci: fix possible null pointer dereference staging: gdm724x: gdm_mux: fix use-after-free on module unload staging: vt6656: use off stack for out buffer USB transfers. staging: vt6656: use off stack for in buffer USB transfers. target/fileio: Fix zero-length READ and WRITE handling ANDROID: sdcardfs: Add linux/kref.h include ANDROID: sdcardfs: Move top to its own struct lowmemorykiller: account for unevictable pages BACKPORT: ARM: dts: add wl12xx/wl18xx bindings Linux 3.18.53 ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode drm/ttm: fix use-after-free races in vm fault handling f2fs: sanity check segment count tcp: fix wraparound issue in tcp_lp ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf ipv6: initialize route null entry in addrconf_init() ipv4, ipv6: ensure raw socket message is big enough to hold an IP header tcp: do not underestimate skb->truesize in tcp_trim_head() staging: emxx_udc: remove incorrect __init annotations brcmfmac: Make skb header writable before use brcmfmac: Ensure pointer correctly set if skb data location changes Revert "KVM: nested VMX: disable perf cpuid reporting" x86/platform/intel-mid: Correct MSI IRQ line for watchdog device kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0 mwifiex: Avoid skipping WEP key deletion for AP mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print power: supply: bq24190_charger: Call set_mode_host() on pm_resume() power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING powerpc/powernv: Fix opal_exit tracepoint opcode cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores mtd: cfi: reduce stack size tty: remove platform_sysrq_reset_seq 9p: fix a potential acl leak ANDROID: android-base.cfg: remove spurious CONFIG_MODULES line HID: logitech-hidpp: adapt to input_configured API change ARM: 8285/1: remove ARMv3 user access code again Revert "cpu: add generic support for CPU feature based module autoloading" PM / Suspend: use time_to_tm for printing timestamps trace: fix trace_graph_ret_raw return type ANDROID: rfkill: fix unused function warning ANDROID: power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled ANDROID: dm: android-verity: hide __setup functions in loadable module ANDROID: memory_state_time: fix undefined behavior with missing DT properties UPSTREAM: wlcore: add p2p device support BACKPORT: wl18xx: add radar detection implementation UPSTREAM: wl18xx: fallback to default conf in case of invalid conf file UPSTREAM: wlcore: sdio: return correct error code UPSTREAM: wlcore: remove wl12xx_platform_data BACKPORT: wl12xx: use frequency instead of enumerations for pdata clocks UPSTREAM: wlcore: add device-tree support UPSTREAM: wlcore: set irq_trigger in board files instead of hiding behind a quirk ANDROID: make PF_KEY SHA256 use RFC-compliant truncation. ANDROID: sdcardfs: fix sdcardfs_destroy_inode for the inode RCU approach Revert "BACKPORT: [UPSTREAM] ext2: convert to mbcache2" Revert "BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache" Revert "BACKPORT: [UPSTREAM] ext4: convert to mbcache2" ANDROID: android-base.cfg: remove NETFILTER_XT_MATCH_QUOTA2_LOG ANDROID: sdcardfs: Don't iput if we didn't igrab Linux 3.18.52 dm ioctl: prevent stack leak in dm ioctl call kbuild: mergeconfig: fix "jobserver unavailable" warning gfs2: remove IS_ERR_VALUE abuse e1000e: fix call to do_div() to use u64 arg cpumask_set_cpu_local_first => cpumask_local_spread, lament modpost: don't emit section mismatch warnings for compiler optimizations modpost: expand pattern matching to support substring matches scsi: advansys: remove #warning message i2o: hide unsafe ioctl on 64-bit staging: unisys: correctly handle return value from queue_delayed_work() MIPS: elf2ecoff: Fix warning due to dead code. MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers. MIPS: jz4740: fix build error in irq.h mm/cma: silence warnings due to max() usage arm64: build vdso without libgcov mISDN: avoid arch specific __builtin_return_address call ips: remove pointless #warning infiniband: mlx5: avoid a compile-time warning tty/isicom: fix big-endian compile warning IB/ehca: fix maybe-uninitialized warnings IB/qib: rename BITS_PER_PAGE to RVT_BITS_PER_PAGE staging: bcm: add 32-bit host dependency staging: imx-drm: fix indentation warning staging: vt6655: fix overly large stack usage arm64: Provide a namespace to NCAPS ARM: cns3xxx: shut up frame size warning mm: avoid setting up anonymous pages into file mapping net: avoid signed overflows for SO_{SND|RCV}BUFFORCE l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind() posix_acl: Clear SGID bit when setting file permissions perf: Tighten (and fix) the grouping condition regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing ALSA: pcm : Call kill_fasync() in stream lock Handle mismatched open calls timerfd: Protect the might cancel mechanism proper net: tg3: avoid uninitialized variable warning cred/userns: define current_user_ns() as a function ALSA: ppc/awacs: shut up maybe-uninitialized warning PCI: xilinx: Fix harmless format string warning mlx5: avoid build warnings on 32-bit mtd: avoid stack overflow in MTD CFI code IB/iser: Fix sparse warnings drbd: avoid redefinition of BITS_PER_PAGE powerpc/ptrace: Fix out of bounds array access warning ftrace/x86: Fix triple fault with graph tracing and suspend-to-ram nfsd: check for oversized NFSv2/v3 arguments Input: i8042 - add Clevo P650RS to the i8042 reset list p9_client_readdir() fix MIPS: KGDB: Use kernel context for sleeping threads ALSA: seq: Don't break snd_use_lock_sync() loop by timeout ip6mr: fix notification device destruction netpoll: Check for skb->queue_mapping sctp: listen on the sock only when it's state is listening or closed net/packet: fix overflow in check for tp_reserve net/packet: fix overflow in check for tp_frame_nr l2tp: purge socket queues in the .destruct() callback net: phy: handle state correctly in phy_stop_machine net: neigh: guard against NULL solicit() method sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write() sparc64: kern_addr_valid regression xen/x86: don't lose event interrupts RDS: Fix the atomicity for congestion map update MIPS: Fix crash registers on non-crashing CPUs md:raid1: fix a dead loop when read from a WriteMostly disk ext4: check if in-inode xattr is corrupted in ext4_expand_extra_isize_ea() xc2028: unlock on error in xc2028_set_config() f2fs: do more integrity verification for superblock ANDROID: android-base.cfg: remove USB_OTG_WAKELOCK ANDROID: android-base.cfg: remove defunct options ANDROID: Add untag hacks to inet_release function Linux 3.18.51 ping: implement proper locking staging/android/ion : fix a race condition in the ion driver vfio/pci: Fix integer overflows, bitmask check xc2028: avoid use after free ARM: 8383/1: nommu: avoid deprecated source register on mov kconfig: tinyconfig: provide whole choice blocks to avoid warnings MIPS: ralink: Cosmetic change to prom_init(). aic94xx: Skip reading user settings if flash is not found ARM: 8296/1: cache-l2x0: clean up aurora cache handling btrfs: fix state->private cast on 32 bit machines gfs2: avoid uninitialized variable warning net: tulip: turn compile-time warning into dev_warn() MIPS: MSP71xx: remove odd locking in PCI config space access code hostap: avoid uninitialized variable use in hfa384x_get_rid misc: ioc4: simplify wave period measurement in clock_calibrate net: vxge: avoid unused function warnings tty: nozomi: avoid a harmless gcc warning brcmfmac: avoid gcc-5.1 warning Fix signed/unsigned pointer warning nfsd: work around a gcc-5.1 warning MIPS: asm: compiler: Add new macros to set ISA and arch asm annotations net: ti: cpmac: Fix compiler warning due to type confusion mm/init: fix zone boundary creation iommu/vt-d: Remove unused variable fs/nfs: fix new compiler warning about boolean in switch perf: Avoid horrible stack usage MIPS: Fix the build on jz4740 after removing the custom gpio.h dm bufio: hide bogus warning gadgetfs: fix uninitialized variable in error handling clk: at91: usb: fix determine_rate prototype again arm64: avoid returning from bad_mode kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction ubi/upd: Always flush after prepared for an update ACPI / power: Avoid maybe-uninitialized warning Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled s390/mm: fix CMMA vs KSM vs others CIFS: remove bad_network_name flag cifs: Do not send echoes before Negotiate is complete ring-buffer: Have ring_buffer_iter_empty() return true when empty tracing: Allocate the snapshot buffer before enabling probe KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings KEYS: Change the name of the dead type to ".dead" to prevent user access KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings ANDROID: uid_sys_stats: fix access of task_uid(task) UPSTREAM: ext4: fix fencepost in s_first_meta_bg validation BACKPORT: ext4: validate s_first_meta_bg at mount time BACKPORT: f2fs: sanity check log_blocks_per_seg ANDROID: sdcardfs: Call lower fs's revalidate ANDROID: sdcardfs: Avoid setting GIDs outside of valid ranges ANDROID: sdcardfs: Copy meta-data from lower inode Revert "Revert "Android: sdcardfs: Don't do d_add for lower fs"" ANDROID: sdcardfs: Use filesystem specific hash Revert "cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions" Revert "ANDROID: Add untag hacks to inet_release function" Revert "ANDROID: Add config check to qtaguid_untag" Linux 3.18.50 give up on gcc ilog2() constant optimizations metag/usercopy: Add missing fixups metag/usercopy: Fix src fixup in from user rapf loops metag/usercopy: Set flags before ADDZ metag/usercopy: Zero rest of buffer from copy_from_user metag/usercopy: Add early abort to copy_to_user metag/usercopy: Fix alignment error checking metag/usercopy: Drop unused macros ring-buffer: Fix return value check in test_ringbuffer() mm/mempolicy.c: fix error handling in set_mempolicy and mbind. mtd: bcm47xxpart: fix parsing first block after aligned TRX mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd() pinctrl: qcom: Don't clear status bit on irq_unmask virtio_balloon: init 1st buffer in stats vq block: allow WRITE_SAME commands with the SG_IO ioctl uvcvideo: uvc_scan_fallback() for webcams with broken chain serial: 8250_pci: Detach low-level driver during PCI error recovery ACPI: Do not create a platform_device for IOAPIC/IOxAPIC ACPI: Fix incompatibility with mcount-based function graph tracing xfs: clear _XBF_PAGES from buffers when readahead page xfs: fix up xfs_swap_extent_forks inline extent handling xfs: don't allow di_size with high bit set igb: add i211 to i210 PHY workaround igb: Workaround for igb i210 firmware issue iommu/vt-d: Fix NULL pointer dereference in device_to_iommu ext4: mark inode dirty after converting inline directory iio: adc: ti_am335x_adc: fix fifo overrun recovery uwb: i1480-dfu: fix NULL-deref at probe uwb: hwa-rc: fix NULL-deref at probe tcp: initialize icsk_ack.lrcvtime at session start time socket, bpf: fix sk_filter use after free in sk_clone_lock net: unix: properly re-increment inflight counter of GC discarded candidates net: properly release sk_frag.page net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled net/mlx5: Increase number of max QPs in default profile ACM gadget: fix endianness in notifications Input: sur40 - validate number of endpoints before using them Input: kbtab - validate number of endpoints before using them Input: cm109 - validate number of endpoints before using them Input: yealink - validate number of endpoints before using them Input: hanwang - validate number of endpoints before using them Input: ims-pcu - validate number of endpoints before using them Input: iforce - validate number of endpoints before using them Input: i8042 - add noloop quirk for Dell Embedded Box PC 3000 ipv4: provide stronger user input validation in nl_fib_input() percpu: acquire pcpu_lock when updating pcpu_nr_empty_pop_pages isdn/gigaset: fix NULL-deref at probe target: Fix VERIFY_16 handling in sbc_parse_cdb md/raid1/10: fix potential deadlock perf/core: Fix event inheritance on fork() arm/arm64: KVM: Take mmap_sem in kvm_arch_prepare_memory_region KVM: kvm_io_bus_unregister_dev() should never fail KVM: x86: clear bus pointer when destroyed KVM: PPC: Book3S PR: Fix illegal opcode emulation net sched actions: decrement module reference count after table flush. sctp: deny peeloff operation on asocs with threads sleeping on it net: ipv6: check route protocol when deleting routes catc: Use heap buffer for memory size test catc: Combine failure cleanup code in catc_probe() rtl8150: Use heap buffers for all register access pegasus: Use heap buffers for all register access virtio-console: avoid DMA from stack dvb-usb-firmware: don't do DMA on stack dvb-usb: don't use stack for firmware load mm: Tighten x86 /dev/mem with zeroing reads rtc: tegra: Implement clock handling platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event dvb-usb-v2: avoid use-after-free crypto: ahash - Fix EINPROGRESS notification callback powerpc: Disable HFSCR[TM] if TM is not supported zram: do not use copy_page with non-page aligned address tty/serial: atmel: fix race condition (TX+DMA) crypto: caam - fix RNG deinstantiation error checking xen/acpi: upload PM state from init-domain to Xen scsi: libsas: fix ata xfer length scsi: sg: check length passed to SG_NEXT_CMD_LEN scsi: libiscsi: add lock around task lists to fix list corruption regression scsi: lpfc: Add shutdown method for kexec target/pscsi: Fix TYPE_TAPE + TYPE_MEDIMUM_CHANGER export powerpc/boot: Fix zImage TOC alignment powerpc: Don't try to fix up misaligned load-with-reservation instructions powerpc/mm: Add missing global TLB invalidate if cxl is active ALSA: seq: Fix race during FIFO resize ALSA: seq: Fix racy cell insertions during snd_seq_pool_done() rtc: s35390a: improve irq handling rtc: s35390a: implement reset routine as suggested by the reference rtc: s35390a: make sure all members in the output are set rtc: s35390a: fix reading out alarm Drivers: hv: balloon: don't crash when memory is added in non-sorted order ptrace: fix PTRACE_LISTEN race corrupting task->state Reset TreeId to zero on SMB2 TREE_CONNECT s390/uaccess: get_user() should zero on failure (again) s390/decompressor: fix initrd corruption caused by bss clear metag/ptrace: Reject partial NT_METAG_RPIPE writes metag/ptrace: Provide default TXSTATUS for short NT_PRSTATUS metag/ptrace: Preserve previous registers for short regset write sparc/ptrace: Preserve previous registers for short regset write mips/ptrace: Preserve previous registers for short regset write c6x/ptrace: Remove useless PTRACE_SETREGSET implementation drm/vmwgfx: fix integer overflow in vmw_surface_define_ioctl() drm/vmwgfx: Remove getparam error message drm/ttm, drm/vmwgfx: Relax permission checking when opening surfaces drm/vmwgfx: avoid calling vzalloc with a 0 size in vmw_get_cap_3d_ioctl() drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl() drm/vmwgfx: Type-check lookups of fence objects kvm: fix page struct leak in handle_vmon Revert "ARM: 8457/1: psci-smp is built only for SMP" char: lack of bool string made CONFIG_DEVPORT always on char: Drop bogus dependency of DEVPORT on !M68K ftrace: Fix removing of second function probe xen, fbfront: fix connecting to backend scsi: sd: Fix capacity calculation with 32-bit sector_t scsi: sr: Sanity check returned mode data iscsi-target: Drop work-around for legacy GlobalSAN initiator iscsi-target: Fix TMR reference leak during session shutdown x86/vdso: Ensure vdso32_enabled gets set to valid values only x86/vdso: Plug race between mapping and ELF header setup perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32() Input: xpad - add support for Razer Wildcat gamepad CIFS: store results of cifs_reopen_file to avoid infinite wait ANDROID: Add config check to qtaguid_untag ANDROID: Add untag hacks to inet_release function ANDROID: uid_sys_stats: reduce update_io_stats overhead UPSTREAM: char: lack of bool string made CONFIG_DEVPORT always on UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K Revert "Android: sdcardfs: Don't do d_add for lower fs" Android: sdcardfs: Don't complain in fixup_lower_ownership Android: sdcardfs: Don't do d_add for lower fs ANDROID: sdcardfs: ->iget fixes Android: sdcardfs: Change cache GID value BACKPORT: [UPSTREAM] ext2: convert to mbcache2 BACKPORT: [UPSTREAM] ext4: convert to mbcache2 BACKPORT: [UPSTREAM] mbcache2: reimplement mbcache UPSTREAM: ARM: keystone2: move update of the phys-to-virt constants into generic code Linux 3.18.49 Input: gscps2 - fix MODULE_DEVICE_TABLE invocation dccp: fix memory leak during tear-down of unsuccessful connection request dccp/tcp: fix routing redirect race uapi: fix linux/packet_diag.h userspace compilation error net: fix socket refcounting in skb_complete_tx_timestamp() net: fix socket refcounting in skb_complete_wifi_ack() tcp: fix various issues for sockets morphing to listen state libceph: don't set weight to IN when OSD is destroyed powerpc: Emulation support for load/store instructions on LE MIPS: DEC: Avoid la pseudo-instruction in delay slots MIPS: ip22: Fix ip28 build for modern gcc MIPS: ip27: Disable qlge driver in defconfig KVM: s390: Fix guest migration for huge guests resulting in panic s390: use correct input data address for setup_randomness s390: make setup_randomness work s390: TASK_SIZE for kernel threads s390/qdio: clear DSCI prior to scanning multiple input queues crypto: ghash-clmulni - Fix load failure crypto: algif_hash - avoid zero-sized array crypto: mcryptd - Fix load failure crypto: cryptd - Assign statesize properly futex: Add missing error handling to FUTEX_REQUEUE_PI futex: Fix potential use-after-free in FUTEX_REQUEUE_PI net/mlx4_core: Fix when to save some qp context flags for dynamic VST to VGT transitions net/mlx4_core: Fix racy CQ (Completion Queue) free net/mlx4_en: Fix bad WQE issue net/packet: fix overflow in check for priv area size dccp: Unlock sock before calling sk_free() net: don't call strlen() on the user buffer in packet_bind_spkt() l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv ipv4: mask tos for input route vti6: return GRE_KEY for vti6 vxlan: correctly validate VXLAN ID against VXLAN_N_VID netlink: remove mmapped netlink support tracing: Add #undef to fix compile error cpmac: remove hopeless #warning drm/ttm: Make sure BOs being swapped out are cacheable drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS drm/ast: Call open_key before enable_mmio in POST code drm/ast: Fix test for VGA enabled samples: move mic/mpssd example code from Documentation padata: avoid race in reordering dm: flush queued bios when process blocks to avoid deadlock mvsas: fix misleading indentation mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy crypto: improve gcc optimization flags for serpent and wp512 ktest: Fix child exit code processing fat: fix using uninitialized fields of fat_inode/fsinfo_inode libceph: use BUG() instead of BUG_ON(1) mac80211: flush delayed work when entering suspend xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD nlm: Ensure callback code also checks that the files match IB/ipoib: Fix deadlock between rmmod and set_mode Bluetooth: Add another AR3012 04ca:3018 device KVM: s390: Disable dirty log retrieval for UCONTROL guests serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards staging: android: ashmem: lseek failed due to no FMODE_LSEEK. xfrm_user: validate XFRM_MSG_NEWAE XFRMA_REPLAY_ESN_VAL replay_window xfrm_user: validate XFRM_MSG_NEWAE incoming ESN size harder xfrm: policy: init locks early raid10: increment write counter after bio is split cancel the setfilesize transation when io error happen tty: n_hdlc: get rid of racy n_hdlc.tbuf TTY: n_hdlc, fix lockdep false positive lib/vsprintf.c: improve sanity check in vsnprintf() net: socket: fix recvmmsg not returning error from sock_error dccp: fix freeing skb too early for IPV6_RECVPKTINFO net/llc: avoid BUG_ON() in skb_orphan() drbd: Fix kernel_sendmsg() usage - potential NULL deref Revert "staging: nvec: ps2: change serio type to passthrough" drivers: staging: nvec: remove bogus reset command for PS/2 interface staging: iio: ad5933: avoid uninitialized variable in error case coredump: fix unfreezable coredumping task swapfile: fix memory corruption via malformed swapfile dib0700: fix nec repeat handling ASoC: cs4270: fix DAPM stream name mismatch netlink: do not enter direct reclaim from netlink_dump() packet: on direct_xmit, limit tso and csum to supported devices sctp: validate chunk len before actually using it net: sctp, forbid negative length ipv4: disable BH in set_ping_group_range() net: pktgen: remove rcu locking in pktgen_change_name() ipv6: correctly add local routes when lo goes up packet: call fanout_release, while UNREGISTERING a netdev net: Add netdev all_adj_list refcnt propagation to fix panic ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route ip6_gre: fix flowi6_proto value in ip6gre_xmit_other() tcp: fix a compile error in DBGUNDO() tcp: fix wrong checksum calculation on MTU probing fbdev: color map copying bounds checking selinux: fix off-by-one in setprocattr pwm: Unexport children before chip removal UBI: fastmap: scrub PEB when bitflips are detected in a free PEB EC header smc91x: avoid self-comparison warning drm/exynos: fix error handling in exynos_drm_subdrv_open ARM: 8584/1: floppy: avoid gcc-6 warning tty: vt, fix bogus division in csi_J Fix potential infoleak in older kernels ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct ANDROID: binder: Add strong ref checks tcp: fix overflow in __tcp_retransmit_skb() iommu/vt-d: Fix IOMMU lookup for SR-IOV Virtual Functions tcp: avoid infinite loop in tcp_splice_read() ipv6: tcp: add a missing tcp_v6_restore_cb() ipv6: tcp: restore IP6CB for pktoptions skbs ip6_gre: fix ip6gre_err() invalid reads l2tp: do not use udp_ioctl() ping: fix a null pointer dereference sit: fix a double free on error path sctp: avoid BUG_ON on sctp_wait_for_sndbuf mlx4: Invoke softirqs after napi_reschedule netlabel: out of bound access in cipso_v4_validate() ipv4: keep skb->dst around in presence of IP options net: use a work queue to defer net_disable_timestamp() work tcp: fix 0 divide in __tcp_select_window() ipv6: pointer math error in ip6_tnl_parse_tlv_enc_lim() ipv6: fix ip6_tnl_parse_tlv_enc_lim() can: Fix kernel panic at security_sock_rcv_skb Revert "af_unix: Fix splice-bind deadlock" UPSTREAM: net: socket: Make unnecessarily global sockfs_setattr() static UPSTREAM: net: ipv4: Don't crash if passing a null sk to ip_do_redirect. UPSTREAM: net/packet: fix overflow in check for priv area size ANDROID: dm verity: Export dm_disk BACKPORT: UPSTREAM: selinux: fix off-by-one in setprocattr ANDROID: Skip building uid_sys_stats and keyreset drivers as modules UPSTREAM: init: export name_to_dev_t and mark name argument as const BACKPORT: UPSTREAM: sysctl: Drop reference added by grab_header in proc_sys_readdir Revert "BACKPORT [UPSTREAM] net: add real socket cookies" BACKPORT: UPSTREAM: dccp: fix freeing skb too early for IPV6_RECVPKTINFO UPSTREAM: ipv4: keep skb->dst around in presence of IP options BACKPORT [UPSTREAM] net: add real socket cookies BACKPORT: checkpatch: special audit for revert commit line ANDROID: sdcardfs: Directly pass lower file for mmap UPSTREAM: PM / sleep: make PM notifiers called symmetrically Revert "ARM: 8457/1: psci-smp is built only for SMP" UPSTREAM: ARM: 8408/1: Fix the secondary_startup function in Big Endian case BACKPORT: ARM: re-implement physical address space switching arm: vdso: Rename timekeeper::tkr to timekeeper::tkr_mono staging: android: ashmem: lseek failed due to no FMODE_LSEEK. ANDROID: sdcardfs: update module info ANDROID: sdcardfs: use d_splice_alias ANDROID: sdcardfs: add read_iter/write_iter opeations ANDROID: sdcardfs: fix ->llseek to update upper and lower offset ANDROID: sdcardfs: copy lower inode attributes in ->ioctl ANDROID: sdcardfs: remove unnecessary call to do_munmap UPSTREAM: ipv6 addrconf: implement RFC7559 router solicitation backoff Revert "[ARM] armv6 dcc tty driver" Revert "arm: dcc_tty: fix armv6 dcc tty build failure" Revert "panic: Add board ID to panic output" video: adf: Set ADF_MEMBLOCK to boolean video: adf: Fix modular build ANDROID: fs: Export vfs_rmdir2 ANDROID: fs: Export free_fs_struct and set_fs_pwd ANDROID: export security_path_chown mm: Export do_munmap Revert "net: socket ioctl to reset connections matching local address" Revert "net: tcp: fix rtable leak in tcp_is_local[6]" Revert "net: fix iterating over hashtable in tcp_nuke_addr()" Revert "net: fix crash in tcp_nuke_addr()" Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested." ANDROID: base-cfg: enable CONFIG_IP_NF_NAT ANDROID: android-base.cfg: enable UID_SYS_STATS android: base-cfg: Add CONFIG_INET_DIAG_DESTROY config: android: set SELinux as default security mode config: android: move device mapper options to recommended ANDROID: android-base.cfg: add CONFIG_MODULES option ANDROID: android-base.cfg: add CONFIG_IKCONFIG option ANDROID: android-base.cfg: properly sort the file ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES. Merge 3.18.40 into android-3.18 Merge 3.18.39 into android-3.18 Merge 3.18.38 into android-3.18 Merge 3.18.37 into android-3.18 config/android: Remove CONFIG_IPV6_PRIVACY net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs. config: disable CONFIG_USELIB and CONFIG_FHANDLE UPSTREAM: seccomp: always propagate NO_NEW_PRIVS on tsync UPSTREAM: arm64: vdso: constify vm_special_mapping used for aarch32 vectors page UPSTREAM: arm64: vdso: add __init section marker to alloc_vectors_page UPSTREAM: ARM: 8597/1: VDSO: put RO and RO after init objects into proper sections UPSTREAM: arm64: Add support for CLOCK_MONOTONIC_RAW in clock_gettime() vDSO UPSTREAM: arm64: Refactor vDSO time functions BACKPORT: arm64: fix vdso-offsets.h dependency UPSTREAM: kbuild: drop FORCE from PHONY targets UPSTREAM: mm: add PHYS_PFN, use it in __phys_to_pfn() UPSTREAM: ARM: 8476/1: VDSO: use PTR_ERR_OR_ZERO for vma check UPSTREAM: arm64: build vdso without libgcov UPSTREAM: arm64: vdso: work-around broken ELF toolchains in Makefile UPSTREAM: mm: fix type cast in __pfn_to_phys() UPSTREAM: mm: move __phys_to_pfn and __pfn_to_phys to asm/generic/memory_model.h UPSTREAM: ARM: 8410/1: VDSO: fix coarse clock monotonicity regression UPSTREAM: ARM: 8405/1: VDSO: fix regression with toolchains lacking ld.bfd executable UPSTREAM: ARM: 8384/1: VDSO: force use of BFD linker UPSTREAM: ARM: 8385/1: VDSO: group link options UPSTREAM: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile UPSTREAM: ARM: 8343/1: VDSO: add build artifacts to .gitignore UPSTREAM: ARM: 8342/1: VDSO: depend on CPU_V7 UPSTREAM: ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits BACKPORT: ARM: 8331/1: VDSO initialization, mapping, and synchronization UPSTREAM: ARM: 8330/1: add VDSO user-space code UPSTREAM: ARM: 8329/1: miscellaneous vdso infrastructure, preparation BACKPORT: time: Add timerkeeper::tkr_raw BACKPORT: time: Rename timekeeper::tkr to timekeeper::tkr_mono ANDROID: sdcardfs: Fix style issues in macros ANDROID: sdcardfs: Use seq_puts over seq_printf ANDROID: sdcardfs: Use to kstrout ANDROID: sdcardfs: Use pr_[...] instead of printk ANDROID: sdcardfs: remove unneeded null check ANDROID: sdcardfs: Fix style issues with comments ANDROID: sdcardfs: Fix formatting ANDROID: sdcardfs: correct order of descriptors ANDROID: fix the deadlock in xt_qtaguid when enable DDEBUG net: ping: check minimum size on ICMP header length netfilter: Change %p to %pK in debug messages UPSTREAM: drivers: android: correct the size of struct binder_uintptr_t for BC_DEAD_BINDER_DONE UPSTREAM: pstore-ram: Allow optional mapping with pgprot_noncached UPSTREAM: pstore-ram: Fix hangs by using write-combine mappings BACKPORT: perf: Fix event->ctx locking misc: uidstat: change release handler for stat read operation power: align wakeup_sources format ANDROID: dm: android-verity: allow disable dm-verity for Treble VTS uid_sys_stats: fix typo in init uid_sys_stats: change to use rt_mutex ANDROID: sdcardfs: Fix gid issue ANDROID: sdcardfs: Use tabs instead of spaces in multiuser.h ANDROID: sdcardfs: Remove uninformative prints ANDROID: sdcardfs: move path_put outside of spinlock ANDROID: sdcardfs: Use case insensitive hash function ANDROID: sdcardfs: declare MODULE_ALIAS_FS ANDROID: sdcardfs: Get the blocksize from the lower fs ANDROID: sdcardfs: Use d_invalidate instead of drop_recurisve ANDROID: sdcardfs: Switch to internal case insensitive compare ANDROID: sdcardfs: Use spin_lock_nested ANDROID: sdcardfs: Replace get/put with d_lock ANDROID: sdcardfs: rate limit warning print ANDROID: sdcardfs: Fix case insensitive lookup ANDROID: Replace spaces by '_' for some android filesystem tracepoints. android: binder: move global binder state into context struct. android: binder: add padding to binder_fd_array_object. binder: use group leader instead of open thread input: evdev: Move wake_lock_destroy call UPSTREAM staging: ion: Fix error handling in ion_buffer_create UPSTREAM: regulator: core: Fix regualtor_ena_gpio_free not to access pin after freeing crypto: arm - ignore generated SHA2 assembly files ANDROID: uid_sys_stats: account for fsync syscalls ANDROID: uid_sys_stats: fix negative write bytes. ANDROID: uid_sys_stats: remove unnecessary code in procstat switch ANDROID: uid_sys_stats: return full size when state is not changed. ANDROID: uid_sys_stats: allow writing same state ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c ANDROID: uid_cputime: add per-uid IO usage accounting UPSTREAM: Input: powermate - fix oops with malicious USB descriptors PM / sleep: Increase default DPM watchdog timeout to 60 Revert "drivers: power: Add watchdog timer to catch drivers which lockup during suspend." cpufreq: interactive governor drops bits in time calculation BACKPORT: n_tty: Fix unordered accesses to lockless read buffer perf: Tighten (and fix) the grouping condition ALSA: pcm : Call kill_fasync() in stream lock ANDROID: sdcardfs: support direct-IO (DIO) operations ANDROID: sdcardfs: implement vm_ops->page_mkwrite ANDROID: sdcardfs: Don't bother deleting freelist ANDROID: sdcardfs: Add missing path_put ANDROID: sdcardfs: Fix incorrect hash ANDROID: Refactor fs readpage/write tracepoints. ANDROID: ext4 crypto: Disables zeroing on truncation when there's no key ANDROID: binder: fix format specifier for type binder_size_t Squashfs: optimize reading uncompressed data Squashfs: implement .readpages() Squashfs: replace buffer_head with BIO Squashfs: refactor page_actor Squashfs: remove the FILE_CACHE option ANDROID: android-recommended.cfg: CONFIG_CPU_SW_DOMAIN_PAN=y UPSTREAM: udp: properly support MSG_PEEK with truncated buffers UPSTREAM: arm64: Allow hw watchpoint of length 3,5,6 and 7 BACKPORT: arm64: hw_breakpoint: Handle inexact watchpoint addresses UPSTREAM: arm64: Allow hw watchpoint at varied offset from base address BACKPORT: hw_breakpoint: Allow watchpoint of length 3,5,6 and 7 ANDROID: sdcardfs: Switch strcasecmp for internal call ANDROID: sdcardfs: switch to full_name_hash and qstr ANDROID: sdcardfs: Add GID Derivation to sdcardfs ANDROID: sdcardfs: Remove redundant operation ANDROID: sdcardfs: add support for user permission isolation ANDROID: sdcardfs: Refactor configfs interface ANDROID: sdcardfs: Allow non-owners to touch UPSTREAM: FROMLIST: 9p: fix a potential acl leak BACKPORT: posix_acl: Clear SGID bit when setting file permissions BACKPORT: Input: xpad - validate USB endpoint count during probe BACKPORT: Input: xpad - fix oops when attaching an unknown Xbox One gamepad android: base-cfg: remove CONFIG_IP[6]_NF_TARGET_REJECT_SKERR android: base-cfg: enable CONFIG_INET_DIAG_DESTROY UPSTREAM: packet: fix race condition in packet_set_ring UPSTREAM: l2tp: fix racy SOCK_ZAPPED flag check in l2tp_ip{,6}_bind() UPSTREAM: netlink: Fix dump skb leak/double free UPSTREAM: net: avoid signed overflows for SO_{SND|RCV}BUFFORCE net: socket: don't set sk_uid to garbage value in ->setattr() ANDROID: mnt: remount should propagate to slaves of slaves ANDROID: configs: CONFIG_ARM64_SW_TTBR0_PAN=y UPSTREAM: arm64: Disable PAN on uaccess_enable() UPSTREAM: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN UPSTREAM: arm64: xen: Enable user access before a privcmd hvc call UPSTREAM: arm64: Handle faults caused by inadvertent user access with PAN enabled BACKPORT: arm64: Disable TTBR0_EL1 during normal kernel execution BACKPORT: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1 BACKPORT: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros UPSTREAM: arm64: alternative: add auto-nop infrastructure BACKPORT: arm64: barriers: introduce nops and __nops macros for NOP sequences Revert "FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros" Revert "FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1" Revert "FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution" Revert "FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled" Revert "FROMLIST: arm64: xen: Enable user access before a privcmd hvc call" Revert "FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN" ANDROID: sdcardfs: Fix locking issue with permision fix up ANDROID: trace: net: use %pK for kernel pointers ANDROID: android-base: Enable QUOTA related configs net: ipv4: Don't crash if passing a null sk to ip_rt_update_pmtu. net: inet: Support UID-based routing in IP protocols. net: core: add UID to flows, rules, and routes net: core: Add a UID field to struct sock. Revert "net: core: Support UID-based routing." Revert "Handle 'sk' being NULL in UID-based routing." Revert "net: core: fix UID-based routing build" Revert "ANDROID: net: fib: remove duplicate assignment" tcp: fix more NULL deref after prequeue changes ipv4: tcp: get rid of ugly unicast_sock tcp: ipv4: initialize unicast_sock sk_pacing_rate Revert "BACKPORT: n_tty: Fix unordered accesses to lockless read buffer" BACKPORT: n_tty: Fix unordered accesses to lockless read buffer ANDROID: dm verity: add minimum prefetch size UPSTREAM: arm64: vdso: Mark vDSO code as read-only FROMLIST: arm64: Enable CONFIG_ARM64_SW_TTBR0_PAN FROMLIST: arm64: xen: Enable user access before a privcmd hvc call FROMLIST: arm64: Handle faults caused by inadvertent user access with PAN enabled BACKPORT: arm64: use ENDPIPROC() to annotate position independent assembler routines FROMLIST: arm64: Disable TTBR0_EL1 during normal kernel execution BACKPORT: arm64: mm: place empty_zero_page in bss UPSTREAM: arm64: head.S: use memset to clear BSS FROMLIST: arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1 FROMLIST: arm64: Factor out PAN enabling/disabling into separate uaccess_* macros UPSTREAM: arm64: use non-global mappings for UEFI runtime regions UPSTREAM: arm64: Store struct thread_info in sp_el0 BACKPORT: arm64: Handle el1 synchronous instruction aborts cleanly BACKPORT: arm64: kernel: Save and restore UAO and addr_limit on exception entry UPSTREAM: Revert "arm64: alternatives: add enable parameter to conditional asm macros" UPSTREAM: arm64: kill ESR_LNX_EXEC UPSTREAM: arm64: add macro to extract ESR_ELx.EC UPSTREAM: arm64: mm: mark fault_info table const BACKPORT: arm64: Fold proc-macros.S into assembler.h UPSTREAM: arm64/kernel: fix incorrect EL0 check in inv_entry macro UPSTREAM: arm64: Add macros to read/write system registers UPSTREAM: arm64: mm: remove dsb from update_mmu_cache UPSTREAM: arm64: tlb: remove redundant barrier from __flush_tlb_pgtable UPSTREAM: arm64: mm: kill mm_cpumask usage UPSTREAM: arm64: switch_mm: simplify mm and CPU checks UPSTREAM: arm64: Use the reserved TTBR0 if context switching to the init_mm UPSTREAM: arm64: tlbflush: avoid flushing when fullmm == 1 UPSTREAM: arm64: tlbflush: remove redundant ASID casts to (unsigned long) BACKPORT: arm64: mm: rewrite ASID allocator and MM context-switching code UPSTREAM: arm64/efi: move virtmap init to early initcall UPSTREAM: arm64/efi: handle potential failure to remap memory map UPSTREAM: arm64: flush: use local TLB and I-cache invalidation UPSTREAM: arm64: kernel: fix __cpu_suspend mm switch on warm-boot UPSTREAM: arm64: efi: don't restore TTBR0 if active_mm points at init_mm UPSTREAM: arm64: proc: de-scope TLBI operation during cold boot UPSTREAM: arm64: Move swapper pagetable definitions UPSTREAM: arm64: mm: remove unused cpu_set_idmap_tcr_t0sz function UPSTREAM: arm64: remove dead code UPSTREAM: arm64: kill flush_cache_all() UPSTREAM: arm/arm64: KVM: Use set/way op trapping to track the state of the caches UPSTREAM: arm64: KVM: Fix HCR setting for 32bit guests UPSTREAM: arm/arm64: KVM: Reset the HCR on each vcpu when resetting the vcpu UPSTREAM: arm64: head.S: ensure idmap_t0sz is visible UPSTREAM: arm64: head.S: ensure visibility of page tables UPSTREAM: arm64: mm: increase VA range of identity map UPSTREAM: arm64: enforce x1|x2|x3 == 0 upon kernel entry as per boot protocol UPSTREAM: arm64: remove __calc_phys_offset UPSTREAM: arm64: merge __enable_mmu and __turn_mmu_on BACKPORT: arm64: use PC-relative reference for secondary_holding_pen_release UPSTREAM: arm64: remove __switch_data object from head.S UPSTREAM: arm64: add macros for common adrp usages UPSTREAM: arm64: Add contiguous page flag shifts and constants UPSTREAM: arm64: entry: always restore x0 from the stack on syscall return BACKPORT: arm64: entry: use ldp/stp instead of push/pop when saving/restoring regs UPSTREAM: arm64: mdscr_el1: avoid exposing DCC to userspace UPSTREAM: locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations UPSTREAM: arm64: mm: ensure patched kernel text is fetched from PoU UPSTREAM: arm64: Use last level TLBI for user pte changes UPSTREAM: arm64: Clean up __flush_tlb(_kernel)_range functions BACKPORT: arm64: force CONFIG_SMP=y and remove redundant #ifdefs UPSTREAM: arm64: move update_mmu_cache() into asm/pgtable.h UPSTREAM: arm64: entry: fix context tracking for el0_sp_pc UPSTREAM: arm64: fix missing syscall trace exit UPSTREAM: arm64: Fix section mismatch on alloc_init_p[mu]d() UPSTREAM: arm64: mm: remove reference to tlb.S from comment block BACKPORT: arm64: expose number of page table levels on Kconfig level UPSTREAM: arm64: mm: remove unused functions and variable protoypes UPSTREAM: arm64: drop unnecessary cache+tlb maintenance UPSTREAM: arm64:mm: free the useless initial page table UPSTREAM: arm64: remove broken cachepolicy code UPSTREAM: arm64: Invalidate the TLB corresponding to intermediate page table levels UPSTREAM: mmu_gather: move minimal range calculations into generic code BACKPORT: mm: avoid setting up anonymous pages into file mapping UPSTREAM: ring-buffer: Prevent overflow of size in ring_buffer_resize() UPSTREAM: arm64: fix dump_instr when PAN and UAO are in use UPSTREAM: arm64: Remove the get_thread_info() function BACKPORT: arm64: kernel: Don't toggle PAN on systems with UAO UPSTREAM: arm64: cpufeature: Test 'matches' pointer to find the end of the list BACKPORT: arm64: kernel: Add support for User Access Override UPSTREAM: arm64: guard asm/assembler.h against multiple inclusions UPSTREAM: arm64: add ARMv8.2 id_aa64mmfr2 boiler plate BACKPORT: arm64: cpufeature: Change read_cpuid() to use sysreg's mrs_s macro UPSTREAM: arm64/kvm: Make use of the system wide safe values BACKPORT: arm64/debug: Make use of the system wide safe value BACKPORT: arm64: add __init/__initdata section marker to some functions/variables UPSTREAM: arm64: cpufeature: Track unsigned fields UPSTREAM: arm64: cpufeature: Add helpers for extracting unsigned values UPSTREAM: arm64: mark cpus_have_hwcap as __maybe_unused UPSTREAM: arm64: cpufeature: declare enable_cpu_capabilities as static UPSTREAM: arm64: Move FP/ASIMD hwcap handling to common code UPSTREAM: arm64: flush FP/SIMD state correctly after execve() UPSTREAM: arm64: fix bug for reloading FPSIMD state after CPU hotplug. UPSTREAM: arm64: kernel thread don't need to save fpsimd context. UPSTREAM: arm64/HWCAP: Use system wide safe values BACKPORT: arm64/capabilities: Make use of system wide safe value UPSTREAM: arm64: Delay cpu feature capability checks UPSTREAM: arm64: Refactor check_cpu_capabilities UPSTREAM: arm64: Cleanup mixed endian support detection UPSTREAM: arm64: Read system wide CPUID value UPSTREAM: arm64: Consolidate CPU Sanity check to CPU Feature infrastructure BACKPORT: arm64: Keep track of CPU feature registers UPSTREAM: arm64: sanity checks: add missing AArch32 registers UPSTREAM: arm64: Handle width of a cpuid feature BACKPORT: arm64: Move /proc/cpuinfo handling code BACKPORT: arm64: Move mixed endian support detection BACKPORT: arm64: Move cpu feature detection code UPSTREAM: arm64: Add COMPAT_HWCAP_LPAE BACKPORT: arm64: Delay cpuinfo_store_boot_cpu UPSTREAM: arm64: Delay ELF HWCAP initialisation until all CPUs are up UPSTREAM: arm64: Make the CPU information more clear BACKPORT: arm64: copy_to-from-in_user optimization using copy template UPSTREAM: arm64: Change memcpy in kernel to use the copy template file UPSTREAM: arm64: remove processor_id UPSTREAM: arm64: alternative: put secondary CPUs into polling loop during patch UPSTREAM: arm64: alternatives: add enable parameter to conditional asm macros BACKPORT: arm64: elf: use cpuid_feature_extract_field for hwcap detection UPSTREAM: arm64: Get rid of struct cpu_table BACKPORT: arm64: lse: use generic cpufeature detection for LSE atomics BACKPORT: arm64: kconfig: group the v8.1 features together UPSTREAM: arm64: cpufeature.h: add missing #include of kernel.h cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions CHROMIUM: cgroups: relax permissions on moving tasks between cgroups Revert "cgroup: refactor allow_attach function into common code" Revert "memcg: add permission check" Revert "cgroup: Add generic cgroup subsystem permission checks" Revert "cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach" Revert "cgroup: Fix issues in allow_attach callback" Revert "Fix generic cgroup subsystem permission checks" Revert "include: linux: cgroup: Fix compiler warning" Revert "cpuset: Add allow_attach hook for cpusets on android." Revert "cpuset: Fix allow_attach hook for cpusets on android." BACKPORT: arm64: kernel: Add support for Privileged Access Never UPSTREAM: arm64/uaccess: fix sparse errors UPSTREAM: arm64: Generalise msr_s/mrs_s operations UPSTREAM: arm64: kernel: Add optional CONFIG_ parameter to ALTERNATIVE() UPSTREAM: arm64: kernel: Add min_field_value and use '>=' for feature detection UPSTREAM: arm64: kernel: Add cpufeature 'enable' callback UPSTREAM: arm64: kernel: Move config_sctlr_el1 BACKPORT: arm64: kernel: Adopt new alternative assembler macros UPSTREAM: arm64: mm: Adopt new alternative assembler macros UPSTREAM: arm64: alternative: Provide if/else/endif assembler macros UPSTREAM: arm64: kernel: Add cpuid_feature_extract_field() for 4bit sign extension BACKPORT: arm64: lib: use pair accessors for copy_*_user routines UPSTREAM: arm64: alternative: Introduce feature for GICv3 CPU interface UPSTREAM: arm64: fix midr range for Cortex-A57 erratum 832075 BACKPORT: arm64: errata: add workaround for cortex-a53 erratum #845719 BACKPORT: arm64: Extract feature parsing code from cpu_errata.c UPSTREAM: arm64: Provide a namespace to NCAPS UPSTREAM: arm64: alternative: Work around .inst assembler bugs BACKPORT: arm64: alternative: Merge alternative-asm.h into alternative.h UPSTREAM: arm64: decode ESR_ELx.EC when reporting exceptions UPSTREAM: arm64: move to ESR_ELx macros UPSTREAM: arm64: introduce common ESR_ELx_* definitions UPSTREAM: arm64: alternative: Allow immediate branch as alternative instruction UPSTREAM: arm64: add module support for alternatives fixups UPSTREAM: arm64: insn: Add aarch64_{get,set}_branch_offset UPSTREAM: arm64: insn: Add aarch64_insn_decode_immediate UPSTREAM: arm64: insn: fix compare-and-branch encodings UPSTREAM: arm64: sanity checks: add ID_AA64DFR{0,1}_EL1 UPSTREAM: arm64: sanity checks: add missing newline to print UPSTREAM: arm64: sanity checks: ignore ID_MMFR0.AuxReg UPSTREAM: arm64: protect alternatives workarounds with Kconfig options UPSTREAM: arm64: add Cortex-A57 erratum 832075 workaround UPSTREAM: arm64: add Cortex-A53 cache errata workaround BACKPORT: arm64: detect silicon revisions and set cap bits accordingly UPSTREAM: arm64: add alternative runtime patching BACKPORT: arm64: add cpu_capabilities bitmap sdcardfs: Change magic value sdcardfs: Use per mount permissions sdcardfs: Add gid and mask to private mount data sdcardfs: User new permission2 functions vfs: Add setattr2 for filesystems with per mount permissions vfs: Add permission2 for filesystems with per mount permissions vfs: Allow filesystems to access their private mount data mnt: Add filesystem private data to mount points sdcardfs: Move directory unlock before touch sdcardfs: fix external storage exporting incorrect uid sdcardfs: Added top to sdcardfs_inode_info sdcardfs: Switch package list to RCU sdcardfs: Fix locking for permission fix up sdcardfs: Check for other cases on path lookup sdcardfs: override umask on mkdir and create ANDROID: video: adf: Avoid directly referencing user pointers BACKPORT: security: fix typo in security_task_prctl android: binder: support for file-descriptor arrays. android: binder: support for scatter-gather. android: binder: add extra size to allocator. android: binder: refactor binder_transact() android: binder: support multiple /dev instances. android: binder: deal with contexts in debugfs. android: binder: support multiple context managers. android: binder: split flat_binder_object. ARM64: Ignore Image-dtb from git point of view arm64: add option to build Image-dtb BACKPORT: lib: harden strncpy_from_user Fix compilation error UPSTREAM: tracefs: Fix refcount imbalance in start_creating() UPSTREAM: tracing: Have mkdir and rmdir be part of tracefs UPSTREAM: tracing: Automatically mount tracefs on debugfs/tracing UPSTREAM: new primitive: debugfs_create_automount() UPSTREAM: debugfs: split end_creating() into success and failure cases UPSTREAM: debugfs: take mode-dependent parts of debugfs_get_inode() into callers UPSTREAM: fold debugfs_mknod() into callers UPSTREAM: fold debugfs_create() into caller UPSTREAM: fold debugfs_mkdir() into caller UPSTREAM: debugfs_mknod(): get rid useless arguments UPSTREAM: fold debugfs_link() into caller UPSTREAM: debugfs: kill __create_file() UPSTREAM: debugfs: split the beginning and the end of __create_file() off UPSTREAM: debugfs_{mkdir,create,link}(): get rid of redundant argument UPSTREAM: tracing: Convert the tracing facility over to use tracefs UPSTREAM: tracing: Move enabling tracepoints to just after rcu_init() UPSTREAM: tracing: Separate out initializing top level dir from instances UPSTREAM: tracing: Make tracing_init_dentry_tr() static UPSTREAM: tracing: Use IS_ERR() check for return value of tracing_init_dentry() UPSTREAM: tracefs: Add directory /sys/kernel/tracing UPSTREAM: tracefs: Add new tracefs file system UPSTREAM: move d_rcu from overlapping d_child to overlapping d_alias UPSTREAM: percpu: fix synchronization between synchronous map extension and chunk destruction UPSTREAM: percpu: fix synchronization between chunk->map_extend_work and chunk destruction ANDROID: binder: Clear binder and cookie when setting handle in flat binder struct ANDROID: binder: Add strong ref checks UPSTREAM: staging/android/ion : fix a race condition in the ion driver ANDROID: android-base: CONFIG_HARDENED_USERCOPY=y UPSTREAM: fs/proc/kcore.c: Add bounce buffer for ktext data UPSTREAM: fs/proc/kcore.c: Make bounce buffer global for read BACKPORT: arm64: Correctly bounds check virt_addr_valid UPSTREAM: KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring UPSTREAM: KEYS: Fix race between key destruction and finding a keyring by name ANDROID: dm: android-verity: Remove fec_header location constraint BACKPORT: audit: consistently record PIDs with task_tgid_nr() UPSTREAM: vmlinux.lds.h: allow arch specific handling of ro_after_init data section UPSTREAM: x86/vdso: Mark the vDSO code read-only after init UPSTREAM: lkdtm: Verify that '__ro_after_init' works correctly UPSTREAM: arch: Introduce post-init read-only memory BACKPORT: x86/mm: Always enable CONFIG_DEBUG_RODATA and remove the Kconfig option UPSTREAM: mm/init: Add 'rodata=off' boot cmdline parameter to disable read-only kernel mappings UPSTREAM: asm-generic: Consolidate mark_rodata_ro() UPSTREAM: arm64: make sys_call_table const ANDROID: fs: Fix for a (allmod) build failure. ANDROID: fs: FS tracepoints to track IO. Android: Fix build breakages. net: inet: diag: expose the socket mark to privileged processes. net: diag: make udp_diag_destroy work for mapped addresses. net: diag: support SOCK_DESTROY for UDP sockets net: diag: allow socket bytecode filters to match socket marks net: diag: slightly refactor the inet_diag_bc_audit error checks. net: diag: Add support to filter on device index BACKPORT: x86: fix SMAP in 32-bit environments UPSTREAM: ARM: alignment: fix alignment handling for uaccess changes UPSTREAM: ARM: software-based priviledged-no-access support UPSTREAM: ARM: 8431/1: fix alignement of __bug_table section entries UPSTREAM: ARM: domains: add memory dependencies to get_domain/set_domain UPSTREAM: ARM: domains: thread_info.h no longer needs asm/domains.h UPSTREAM: ARM: uaccess: fix undefined instruction on ARMv7M/noMMU UPSTREAM: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_op_inuser() explicitly BACKPORT: sched/preempt, arm/futex: Disable preemption in UP futex_atomic_cmpxchg_inatomic() explicitly UPSTREAM: ARM: entry: provide uaccess assembly macro hooks UPSTREAM: ARM: entry: get rid of multiple macro definitions UPSTREAM: ARM: 8266/1: Remove early stack deallocation from restore_user_regs UPSTREAM: ARM: mm: improve do_ldrd_abort macro UPSTREAM: ARM: swpan: fix nwfpe for uaccess changes UPSTREAM: ARM: domains: remove DOMAIN_TABLE UPSTREAM: ARM: domains: keep vectors in separate domain UPSTREAM: ARM: domains: get rid of manager mode for user domain UPSTREAM: ARM: domains: move initial domain setting value to asm/domains.h UPSTREAM: ARM: redo TTBR setup code for LPAE UPSTREAM: ARM: 8350/1: proc-feroceon: Fix feroceon_proc_info macro UPSTREAM: ARM: 8314/1: replace PROCINFO embedded branch with relative offset UPSTREAM: ARM: 8196/1: vfp: Workaround bad MVFR1 register on some Kraits UPSTREAM: ARM: domains: provide domain_mask() UPSTREAM: ARM: domains: switch to keeping domain value in register UPSTREAM: all arches, signal: move restart_block to struct task_struct UPSTREAM: audit: fix a double fetch in audit_log_single_execve_arg() UPSTREAM: Fix broken audit tests for exec arg len UPSTREAM: audit: Fix check of return value of strnlen_user() UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Revert "BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Modern ARMv7-A/R cores optionally implement below new hardware feature:" Revert "UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor The VMSA field of MMFR0 (bottom 4 bits) is incremented for each added feature. PXN is supported if the value is >= 4 and LPAE is supported if it is >= 5." UPSTREAM: perf: Fix race in swevent hash ANDROID: dm: Fix symbol exports for dm target callbacks UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor The VMSA field of MMFR0 (bottom 4 bits) is incremented for each added feature. PXN is supported if the value is >= 4 and LPAE is supported if it is >= 5. BACKPORT: ARM: 8235/1: Support for the PXN CPU feature on ARMv7 Modern ARMv7-A/R cores optionally implement below new hardware feature: ANDROID: dm: android-verity: Allow android-verity to be compiled as an independent module FROMLIST: pstore: drop pmsg bounce buffer UPSTREAM: usercopy: remove page-spanning test for now UPSTREAM: usercopy: force check_object_size() inline BACKPORT: usercopy: fold builtin_const check into inline function UPSTREAM: x86/uaccess: force copy_*_user() to be inlined UPSTREAM: block: fix use-after-free in sys_ioprio_get() UPSTREAM: HID: core: prevent out-of-bound readings UPSTREAM: sg: Fix double-free when drives detach during SG_IO UPSTREAM: tty: Prevent ldisc drivers from re-using stale tty fields BACKPORT: netfilter: nfnetlink: correctly validate length of batch messages UPSTREAM: netfilter: nfnetlink: validate nfnetlink header from batch cpuset: Make cpusets restore on hotplug UPSTREAM: Make the hardened user-copy code depend on having a hardened allocator UPSTREAM: usercopy: fix overlap check for kernel text UPSTREAM: usercopy: avoid potentially undefined behavior in pointer math UPSTREAM: mm: SLUB hardened usercopy support UPSTREAM: mm/slub: support left redzone UPSTREAM: mm: SLAB hardened usercopy support BACKPORT: arm64/uaccess: Enable hardened usercopy BACKPORT: ARM: uaccess: Enable hardened usercopy UPSTREAM: ARM: fix uaccess_with_memcpy() with SW_DOMAIN_PAN BACKPORT: ARM: uaccess: provide uaccess_save_and_enable() and uaccess_restore() BACKPORT: x86/uaccess: Enable hardened usercopy BACKPORT: mm: Hardened usercopy BACKPORT: mm: Implement stack frame object validation UPSTREAM: mm: Add is_migrate_cma_page UPSTREAM: unsafe_[get|put]_user: change interface to use a error target label BACKPORT: arm64: mm: fix location of _etext BACKPORT: ARM: 8583/1: mm: fix location of _etext UPSTREAM: Use the new batched user accesses in generic user string handling BACKPORT: Add 'unsafe' user access functions for batched accesses UPSTREAM: x86: reorganize SMAP handling in user space accesses UPSTREAM: x86/uaccess: Tell the compiler that uaccess is unlikely to fault UPSTREAM: x86/uaccess: fix sparse errors UPSTREAM: tcp: fix use after free in tcp_xmit_retransmit_queue() Don't show empty tag stats for unprivileged uids ext4 crypto: fix bugs in ext4_encrypted_zeroout() ext4 crypto: replace some BUG_ON()'s with error checks ext4 crypto: ext4_page_crypto() doesn't need a encryption context ext4: optimize ext4_writepage() for attempted 4k delalloc writes ext4 crypto: fix memory leak in ext4_bio_write_page() ext4: disable zeroout optimization when encryption is enabled ext4 crypto: remove duplicate header file ext4 crypto: fix spelling typo in comment ext4 crypto: exit cleanly if ext4_derive_key_aes() fails ext4 crypto: check for too-short encrypted file names ext4 crypto: use a jbd2 transaction when adding a crypto policy ext4 crypto: fail the mount if blocksize != pagesize ext4 crypto: fix sparse warnings in fs/ext4/ioctl.c ext4 crypto: fix ext4_get_crypto_ctx()'s calling convention in ext4_decrypt_one ext4 crypto: allocate bounce pages using GFP_NOWAIT ext4 crypto: release crypto resource on module exit ext4 crypto: handle unexpected lack of encryption keys ext4 crypto: allocate the right amount of memory for the on-disk symlink ext4 crypto: clean up error handling in ext4_fname_setup_filename ext4 crypto: policies may only be set on directories ext4 crypto: enforce crypto policy restrictions on cross-renames ext4 crypto: encrypt tmpfile located in encryption protected directory ext4 crypto: make sure the encryption info is initialized on opendir(2) ext4 crypto: set up encryption info for new inodes in ext4_inherit_context() ext4 crypto: fix memory leaks in ext4_encrypted_zeroout ext4 crypto: use per-inode tfm structure ext4 crypto: require CONFIG_CRYPTO_CTR if ext4 encryption is enabled ext4 crypto: shrink size of the ext4_crypto_ctx structure ext4 crypto: get rid of ci_mode from struct ext4_crypt_info ext4 crypto: use slab caches ext4: clean up superblock encryption mode fields ext4 crypto: reorganize how we store keys in the inode ext4 crypto: separate kernel and userspace structure for the key ext4 crypto: don't allocate a page when encrypting/decrypting file names ext4 crypto: optimize filename encryption ext4 crypto: Do not select from EXT4_FS_ENCRYPTION ext4 crypto: add padding to filenames before encrypting ext4 crypto: simplify and speed up filename encryption ext4 crypto: enable encryption feature flag ext4 crypto: Add symlink encryption ext4 crypto: enable filename encryption ext4 crypto: filename encryption modifications ext4 crypto: partial update to namei.c for fname crypto ext4 crypto: insert encrypted filenames into a leaf directory block ext4 crypto: teach ext4_htree_store_dirent() to store decrypted filenames ext4 crypto: filename encryption facilities ext4 crypto: implement the ext4 decryption read path ext4 crypto: implement the ext4 encryption write path ext4 crypto: inherit encryption policies on inode and directory create ext4 crypto: enforce context consistency ext4 crypto: add encryption key management facilities ext4 crypto: add ext4 encryption facilities ext4 crypto: add encryption policy and password salt support ext4 crypto: add encryption xattr support ext4 crypto: export ext4_empty_dir() ext4 crypto: add ext4 encryption Kconfig ext4 crypto: reserve codepoints used by the ext4 encryption feature ext4 crypto: add ext4_mpage_readpages() UPSTREAM: proc: prevent accessing /proc/<PID>/environ until it's ready UPSTREAM: [media] xc2028: unlock on error in xc2028_set_config() UPSTREAM: [media] xc2028: avoid use after free Android: MMC/UFS IO Latency Histograms. UPSTREAM: block: fix use-after-free in seq file UPSTREAM: assoc_array: don't call compare_object() on a node ANDROID: base-cfg: enable SECCOMP config DEBUG: cpufreq: fix cpu_capacity tracing build for non-smp systems UPSTREAM: capabilities: ambient capabilities kernel: kcov: include missing header for ‘struct task_struct’ arm: Fix #if/#ifdef typo in topology.c arm: Fix build error "conflicting types for 'scale_cpu_capacity'" Revert "Android: MMC/UFS IO Latency Histograms." Android: MMC/UFS IO Latency Histograms. UPSTREAM: af_unix: Guard against other == sk in unix_dgram_sendmsg UPSTREAM: ALSA: timer: Fix race among timer ioctls ipv6: fix endianness error in icmpv6_err net: ipv6: Fix ping to link-local addresses. UPSTREAM: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback BACKPORT: tcp: make challenge acks less predictable BACKPORT: ecryptfs: fix handling of directory opening UPSTREAM: ecryptfs: don't allow mmap when the lower fs doesn't support it UPSTREAM: Revert "ecryptfs: forbid opening files without mmap handler" ANDROID: net: fib: remove duplicate assignment arm64: defconfig: add few misc configs for development/debugging/testing BACKPORT: kernel: add kcov code coverage sched/autogroup: Fix failure to set cpu.rt_runtime_us sched: Fix hrtick_start() on UP vmstat: make vmstat_updater deferrable again and shut down on idle UPSTREAM: cpuidle: Clean up fallback handling in cpuidle_idle_call() UPSTREAM: PM / sleep: Re-implement suspend-to-idle handling UPSTREAM: sched: Improve load balancing in the presence of idle CPUs sched/fair: call OPP update when going idle after migration UPSTREAM: sched/fair: Avoid pulling all tasks in idle balancing UPSTREAM: sched: Add SD_PREFER_SIBLING for SMT level sched/cpufreq_sched: fix thermal capping events sched/fair: Picking cpus with low OPPs for tasks that prefer idle CPUs FIXUP: sched/tune: do initialization as a postcore_initicall DEBUG: sched: add tracepoint for RD overutilized sched/tune: Introducing a new schedtune attribute prefer_idle sched: use util instead of capacity to select busy cpu arch_timer: add error handling when the MPM global timer is cleared cpufreq: introduce cpufreq_driver_is_slow arm: Enable max freq invariant scheduler load-tracking and capacity support arm: Cpu invariant scheduler load-tracking and capacity support arm: topology: Define TC2 energy and provide it to the scheduler arm: Update arch_scale_cpu_capacity() to reflect change to define arm: Enable frequency invariant scheduler load-tracking support arm64, topology: Updates to use DT bindings for EAS costing data sched: Support for extracting EAS energy costs from DT Documentation: DT bindings for energy model cost data required by EAS cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h cpumask, nodemask: implement cpumask/nodemask_pr_args() kernel: make READ_ONCE() valid on const arguments kernel: Change ASSIGN_ONCE(val, x) to WRITE_ONCE(x, val) kernel: Provide READ_ONCE and ASSIGN_ONCE UPSTREAM: net: Fix use after free in the recvmmsg exit path Implement memory_state_time, used by qcom,cpubw power: Refactors the code which prints suspend time. UPSTREAM: ecryptfs: forbid opening files without mmap handler UPSTREAM: proc: prevent stacking filesystems on top UPSTREAM: ppp: defer netns reference release for ppp channel cpuset: Fix allow_attach hook for cpusets on android. cpuset: Add allow_attach hook for cpusets on android. Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic" CHROMIUM: android: binder: Fix potential scheduling-while-atomic UPSTREAM: netfilter: x_tables: make sure e->next_offset covers remaining blob size UPSTREAM: netfilter: x_tables: validate e->target_offset early UPSTREAM: KEYS: potential uninitialized variable UPSTREAM: unix: avoid use-after-free in ep_remove_wait_queue UPSTREAM: KEYS: Fix ASN.1 indefinite length object parsing UPSTREAM: ppp: take reference on channels netns BACKPORT: ipv6: tcp: add rcu locking in tcp_v6_send_synack() UPSTREAM: netfilter: x_tables: fix unconditional helper UPSTREAM: ipv6: Don't reduce hop limit for an interface UPSTREAM: ipv4: try to cache dst_entries which would cause a redirect UPSTREAM: ASN.1: Fix non-match detection failure on data overrun ANDROID: sdcardfs: fix itnull.cocci warnings UPSTREAM: KEYS: close race between key lookup and freeing ANDROID: dm: android-verity: Verify header before fetching table android-recommended.cfg: enable fstack-protector-strong sdcardfs: Truncate packages_gid.list on overflow UPSTREAM: cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind UPSTREAM: udp: fix behavior of wrong checksums ANDROID: dm: allow adb disable-verity only in userdebug ANDROID: dm: mount as linear target if eng build netfilter: xt_quota2: make quota2_log work well UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt UPSTREAM: ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS UPSTREAM: net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom BACKPORT: ipv6: add complete rcu protection around np->opt BACKPORT: net: fix infoleak in rtnetlink BACKPORT: netfilter: Kconfig: get rid of parens around depends on cpu: send KOBJ_ONLINE event when enabling cpus ANDROID: dm verity fec: initialize recursion level ANDROID: dm verity fec: fix RS block calculation ANDROID: dm verity fec: pack the fec_header structure ANDROID: dm verity fec: add missing release from fec_ktype ANDROID: dm verity fec: limit error correction recursion ANDROID: restrict access to perf events FROMLIST: security,perf: Allow further restriction of perf_event_open BACKPORT: perf tools: Document the perf sysctls ANDROID: dm: use default verity public key ANDROID: dm: fix signature verification flag UPSTREAM: tty: Fix unsafe ldisc reference via ioctl(TIOCGETD) UPSTREAM: procfs: fixes pthread cross-thread naming if !PR_DUMPABLE ANDROID: dm: use name_to_dev_t dm: fix dm_substitute_devices() fuse: Add support for d_canonical_path vfs: change d_canonical_path to take two paths UPSTREAM: arm64: Fix text patching logic when using fixmap BACKPORT: selinux: restrict kernel module loading android: base-cfg: enable CONFIG_QUOTA ANDROID: dm: rename dm-linear methods for dm-android-verity ANDROID: dm verity fec: add sysfs attribute fec/corrected sdcardfs: remove unneeded __init and __exit sdcardfs: Remove unused code ANDROID: dm: Mounting root as linear device when verity disabled BACKPORT: nl80211: Stop scheduled scan if netlink client disappears sdcardfs: remove effectless config option trace: cpufreq: fix typo in min/max cpufreq inotify: Fix erroneous update of bit count sdcardfs: Add support for d_canonicalize vfs: add d_canonical_path for stacked filesystem support sdcardfs: Bring up to date with Android M permissions: Changed type-casting in packagelist management Port of sdcardfs to 3.18 Included sdcardfs source code for kernel 3.0 BACKPORT: FROMLIST: mm: ASLR: use get_random_long() FROMLIST: drivers: char: random: add get_random_long() UPSTREAM: ALSA: timer: Harden slave timer list handling ANDROID: dm-crypt: Remove WQ_NON_REENTRANT flag. ANDROID: recommended.cfg: Setup verity root A/B ANDROID: dm-android-verity: Rebase on top of 4.1 ANDROID: dm: Rebase on top of 4.1 ANDROID: dm: Add android verity target UPSTREAM: lib/string.c: introduce strreplace() CHROMIUM: dm: boot time specification of dm= ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue ANDROID: dm-verity: run in a WQ_HIGHPRI workqueue net: tcp: fix rtable leak in tcp_is_local[6] UPSTREAM: arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers UPSTREAM: dm crypt: sort writes UPSTREAM: dm crypt: offload writes to thread UPSTREAM: dm crypt: remove unused io_pool and _crypt_io_pool UPSTREAM: dm crypt: avoid deadlock in mempools UPSTREAM: dm crypt: don't allocate pages for a partial request android: base-cfg: Add CONFIG_IP_MULTICAST Conflicts: Documentation/sysctl/kernel.txt android/configs/android-base.cfg arch/arm/kernel/head-nommu.S arch/arm/kernel/vdso.c arch/arm/mm/mmap.c arch/arm/mm/mmu.c arch/arm/vdso/vgettimeofday.c arch/arm64/Kconfig arch/arm64/include/asm/assembler.h arch/arm64/include/asm/cacheflush.h arch/arm64/include/asm/cputype.h arch/arm64/include/asm/mmu_context.h arch/arm64/include/asm/pgalloc.h arch/arm64/include/asm/thread_info.h arch/arm64/include/asm/tlbflush.h arch/arm64/kernel/Makefile arch/arm64/kernel/alternative.c arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpu_ops.c arch/arm64/kernel/cpuinfo.c arch/arm64/kernel/entry.S arch/arm64/kernel/insn.c arch/arm64/kernel/setup.c arch/arm64/kernel/smp.c arch/arm64/kernel/topology.c arch/arm64/kernel/traps.c arch/arm64/lib/memcpy.S arch/arm64/lib/memmove.S arch/arm64/lib/memset.S arch/arm64/mm/cache.S arch/arm64/mm/context.c arch/arm64/mm/fault.c arch/arm64/mm/mmu.c arch/x86/Kconfig drivers/cpufreq/cpufreq.c drivers/cpuidle/cpuidle.c drivers/gpu/drm/vmwgfx/vmwgfx_surface.c drivers/md/Makefile drivers/md/dm-android-verity.c drivers/md/dm-crypt.c drivers/media/tuners/tuner-xc2028.c drivers/misc/Kconfig drivers/misc/Makefile drivers/misc/uid_sys_stats.c drivers/mmc/card/Kconfig drivers/mmc/card/block.c drivers/mmc/card/queue.c drivers/mmc/card/queue.h drivers/mmc/core/bus.c drivers/mmc/core/core.c drivers/mmc/core/host.c drivers/mmc/core/mmc.c drivers/mmc/host/sdhci.c drivers/net/usb/cdc_ncm.c drivers/net/usb/qmi_wwan.c drivers/scsi/ufs/ufshcd.c drivers/scsi/ufs/ufshcd.h drivers/staging/android/binder.c drivers/staging/android/ion/ion.c drivers/tty/serial/atmel_serial.c drivers/tty/sysrq.c drivers/usb/core/quirks.c drivers/usb/gadget/configfs.c drivers/usb/gadget/function/f_accessory.c drivers/usb/gadget/function/f_fs.c drivers/usb/gadget/function/f_mass_storage.c drivers/usb/gadget/function/f_midi.c drivers/usb/gadget/function/f_mtp.c drivers/usb/gadget/function/u_ether.c drivers/usb/gadget/legacy/gmidi.c drivers/usb/host/xhci-plat.c drivers/usb/host/xhci-ring.c drivers/usb/host/xhci.c drivers/usb/serial/option.c drivers/usb/serial/qcserial.c drivers/video/fbdev/core/fbcmap.c fs/9p/acl.c fs/btrfs/acl.c fs/ext2/acl.c fs/ext4/acl.c fs/ext4/crypto.c fs/ext4/crypto_fname.c fs/ext4/crypto_key.c fs/ext4/crypto_policy.c fs/ext4/dir.c fs/ext4/ext4.h fs/ext4/ext4_crypto.h fs/ext4/inline.c fs/ext4/ioctl.c fs/ext4/namei.c fs/ext4/page-io.c fs/ext4/readpage.c fs/f2fs/acl.c fs/f2fs/data.c fs/f2fs/f2fs.h fs/f2fs/super.c fs/gfs2/acl.c fs/hfsplus/posix_acl.c fs/namei.c fs/ocfs2/acl.c fs/pnode.c fs/reiserfs/xattr_acl.c fs/sdcardfs/inode.c fs/sdcardfs/lookup.c fs/sdcardfs/main.c fs/sdcardfs/packagelist.c fs/sdcardfs/sdcardfs.h fs/squashfs/block.c fs/xfs/xfs_acl.c include/linux/cgroup.h include/linux/mmc/card.h include/linux/mmc/core.h include/linux/mmc/host.h include/linux/mmc/mmc.h include/linux/mmzone.h include/linux/posix_acl.h include/linux/sched.h include/linux/sched/sysctl.h include/net/cfg80211.h include/trace/events/sched.h include/uapi/linux/ipv6.h init/do_mounts_dm.c kernel/cgroup.c kernel/events/core.c kernel/exit.c kernel/power/wakeup_reason.c kernel/sched/Makefile kernel/sched/core.c kernel/sched/cputime.c kernel/sched/deadline.c kernel/sched/fair.c kernel/sched/features.h kernel/sched/rt.c kernel/sched/sched.h kernel/sched/stop_task.c kernel/sysctl.c kernel/trace/trace.c lib/Kconfig.debug mm/Makefile mm/memory.c mm/page_alloc.c mm/slub.c net/ipv4/tcp.c net/ipv4/tcp_input.c net/netfilter/xt_qtaguid.c net/netfilter/xt_quota2.c net/unix/af_unix.c net/wireless/nl80211.c net/xfrm/xfrm_user.c scripts/kconfig/Makefile sound/usb/quirks-table.h USB, MMC and scheduler related changes were ignored as per feedback from respective teams. Some of the commit headers in the commit message are common with earlier upmerge commit, because this merge is merging google-common tip and earlier merges were with lsk-android. Change-Id: Idf6bc8ca9c902e3ac1cdae30a1820304bc909d9c Signed-off-by: Imran Khan <kimran@codeaurora.org>
| * | Merge 3.18.58 into android-3.18Greg Kroah-Hartman2017-06-271-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in 3.18.58 s390/vmem: fix identity mapping partitions/msdos: FreeBSD UFS2 file systems are not recognized Call echo service immediately after socket reconnect net: xilinx_emaclite: fix freezes due to unordered I/O net: xilinx_emaclite: fix receive buffer overflow ipv6: Handle IPv4-mapped src to in6addr_any dst. ipv6: Inhibit IPv4-mapped src address on the wire. log2: make order_base_2() behave correctly on const input value zero sparc64: make string buffers large enough configfs: Fix race between create_link and configfs_rmdir can: gs_usb: fix memory leak in gs_cmd_reset() cpufreq: conservative: Allow down_threshold to take values from 1 to 10 vb2: Fix an off by one error in 'vb2_plane_vaddr' mac80211: don't look at the PM bit of BAR frames serial: efm32: Fix parity management in 'efm32_uart_console_get_options()' x86/mm/32: Set the '__vmalloc_start_set' flag in initmem_init() mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode staging: rtl8188eu: prevent an underflow in rtw_check_beacon_data() iio: proximity: as3935: recalibrate RCO after resume USB: hub: fix SS max number of ports usb: core: fix potential memory leak in error path during hcd creation pvrusb2: reduce stack usage pvr2_eeprom_analyze() USB: gadget: dummy_hcd: fix hub-descriptor removable fields usb: r8a66597-hcd: select a different endpoint on timeout usb: r8a66597-hcd: decrease timeout drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR() usb: xhci: ASMedia ASM1042A chipset need shorts TX quirk mm/memory-failure.c: use compound_head() flags for huge pages swap: cond_resched in swap_cgroup_prepare() genirq: Release resources in __setup_irq() error path alarmtimer: Rate limit periodic intervals mm: larger stack guard gap, between vmas Allow stack to grow up to address space limit mm: fix new crash in unmapped_area_topdown() Linux 3.18.58 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| | * USB: hub: fix SS max number of portsJohan Hovold2017-06-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 93491ced3c87c94b12220dbac0527e1356702179 upstream. Add define for the maximum number of ports on a SuperSpeed hub as per USB 3.1 spec Table 10-5, and use it when verifying the retrieved hub descriptor. This specifically avoids benign attempts to update the DeviceRemovable mask for non-existing ports (should we get that far). Fixes: dbe79bbe9dcb ("USB 3.0 Hub Changes") Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | usb: gadget: Fixes enumeration failure on Windows 10Sriharsha Allenki2017-02-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes USB Video function(UVC 1.5) enumeartion failure on Windows 10 by updating the processing unit descriptor of UVC class from 1.1 to 1.5. Changes the SAR width and SAR height attributes of H.264 frame descriptors to a non zero value as Windows 10 expects a non-zero value without which the video function enumeration fails. Change-Id: I5e1f0bd10e94b3a081d6607a1287f3cb4d3b5c41 Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
* | | usb: gadget: Support H264 format for f_uvc driverSriharsha Allenki2016-12-271-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | Added support for H264 payload format and UVC 1.5 specification for existing f_uvc driver. Change-Id: I2bad365dc6af7473bb2a62cc013da6e83c209811 Signed-off-by: Sriharsha Allenki <sallenki@codeaurora.org>
* | | USB: QTI: uapi header splitJeremy Gebben2015-12-071-0/+41
| | | | | | | | | | | | | | | | | | | | | Move userspace visible definitions to the uapi directory. Change-Id: I526f17998baad3c87912d9623b5ca9239631fb8f Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
* | | USB: phy-msm: use correct types in uapi headersJeremy Gebben2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | off_t is not defined in uapi headers, use __kernel_off_t instead. Change-Id: I031ab362015a7da2c904ff2583c6a66c948ee1f7 Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
* | | USB: phy: Add snapshot of PHY msm usb driverTarun Gupta2015-06-211-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This snapshot is taken from msm-3.10 commit f62f95b715a5 (Merge "dwc3-msm: Turn on 1.8V LDO before turning on 3.3V LDO"). This change adds snapshot of missing changes in phy-msm-usb drivers Change-Id: I6fe32a60a5768ae8afaaef1749674e9fa6490569 Signed-off-by: Tarun Gupta <tarung@codeaurora.org>
* | | usb: gadget: f_fs: remove deprecated marking from usb_functionfs_descs_headMatt Wagantall2015-05-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | MSM targets still reply on struct usb_functionfs_descs_head. Remove the deprecated flag for now, to avoid compilation warnings. Change-Id: I705fa5ace54f57334c9daf0cee23bb9f319cf154 Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
* | | usb: gadget: Add snapshot of MBIM function driverJack Pham2015-05-301-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This snapshot is taken as of msm-3.14 commit: commit 3bc54cf86b (Merge "msm: camera: Add dummy sub module in sensor pipeline") This driver implements Mobile Broadband Interface Model protocol. Control messages are transferred through QBI module running in user space and communicating with mbim using file operations interface android_mbim. Data is transferred on SPS, Bam-to-Bam. [jackp@codeaurora.org: Fixed up to use upstream definitions from cdc.h] Signed-off-by: Jack Pham <jackp@codeaurora.org>
* | usb: gadget: f_accessory: move userspace interface to uapiColin Cross2015-02-041-0/+146
| | | | | | | | | | | | | | | | Move the entire contents of linux/usb/f_accessory.h header to uapi, it only contains a userspace interface. Change-Id: Ieb5547da449588ae554988a201c0e6b4e3afc531 Signed-off-by: Colin Cross <ccross@android.com>
* | usb: gadget: f_mtp: move userspace interface to uapiColin Cross2015-02-041-0/+61
|/ | | | | | | | | Move the most of linux/usb/f_mtp.h header to uapi. Move the only remaining structure definition into f_mtp.c, the only place that uses it. Change-Id: I952c1a9dc15c36bf295a0eb4d74b6b1ad912ed03 Signed-off-by: Colin Cross <ccross@android.com>
* usb: gadget: f_fs: virtual endpoint address mappingRobert Baldyga2014-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces virtual endpoint address mapping. It separates function logic form physical endpoint addresses making it more hardware independent. Following modifications changes user space API, so to enable them user have to switch on the FUNCTIONFS_VIRTUAL_ADDR flag in descriptors. Endpoints are now refered using virtual endpoint addresses chosen by user in endpoint descpriptors. This applies to each context when endpoint address can be used: - when accessing endpoint files in FunctionFS filesystemi (in file name), - in setup requests directed to specific endpoint (in wIndex field), - in descriptors returned by FUNCTIONFS_ENDPOINT_DESC ioctl. In endpoint file names the endpoint address number is formatted as double-digit hexadecimal value ("ep%02x") which has few advantages - it is easy to parse, allows to easly recognize endpoint direction basing on its name (IN endpoint number starts with digit 8, and OUT with 0) which can be useful for debugging purpose, and it makes easier to introduce further features allowing to use each endpoint number in both directions to have more endpoints available for function if hardware supports this (for example we could have ep01 which is endpoint 1 with OUT direction, and ep81 which is endpoint 1 with IN direction). Physical endpoint address can be still obtained using ioctl named FUNCTIONFS_ENDPOINT_REVMAP, but now it's not neccesary to handle USB transactions properly. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* usb: gadget: f_fs: add ioctl returning ep descriptorRobert Baldyga2014-09-091-0/+6
| | | | | | | | | | This patch introduces ioctl named FUNCTIONFS_ENDPOINT_DESC, which returns endpoint descriptor to userspace. It works only if function is active. Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* tools: ffs-test: convert to new descriptor formatMichal Nazarewicz2014-09-021-1/+1
| | | | | | | | | | | Since commit [ac8dde11: “Add flags to descriptors block”] functionfs supports a new, more powerful and extensible, descriptor format. Since ffs-test is probably the first thing users of the functionfs interface see when they start writing functionfs user space daemons, convert it to use the new format thus promoting it. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* usb: gadget: f_fs: add usb_functionfs_descs_head_v2 structureMichal Nazarewicz2014-09-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The structure can be used with user space tools that use the new functionfs description format, for example as follows: static const struct { struct usb_functionfs_descs_head_v2 header; __le32 fs_count; __le32 hs_count; struct { … } fs_desc; struct { … } hs_desc; } descriptors = { .header = { .magic = cpu_to_le32(FUNCTIONFS_DESCRIPTORS_MAGIC_V2), .length = cpu_to_le32(sizeof(descriptors)), .flags = cpu_to_le32(FUNCTIONFS_HAS_FS_DESC | FUNCTIONFS_HAS_HS_DESC) }, .fs_count = cpu_to_le32(X), .fs_desc = { … }, .hs_count = cpu_to_le32(Y), .hs_desc = { … } }; Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* Merge tag 'usb-for-v3.17' of ↵Greg Kroah-Hartman2014-07-211-2/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next Felipe writes: usb: patches for v3.17 merge window Surprisingly enough, while a big set of patches, the majority is composed of cleanups (using devm_*, fixing sparse errors, moving code around, adding const, etc). The highlights are addition of new support for PLX USB338x devices, and support for USB 2.0-only configurations of the DWC3 IP core. Signed-of-by: Felipe Balbi <balbi@ti.com>
| * usb: gadget: f_fs: OS descriptors supportAndrzej Pietrasiewicz2014-07-101-2/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for OS descriptors. The new format of descriptors is used, because the "flags" field is required for extensions. os_count gives the number of OSDesc[] elements. The format of descriptors is given in include/uapi/linux/usb/functionfs.h. For extended properties descriptor the usb_ext_prop_desc structure covers only a part of a descriptor, because the wPropertyNameLength is unknown up front. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* | usb: gadget: f_fs: resurect usb_functionfs_descs_head structureMichal Nazarewicz2014-06-271-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though usb_functionfs_descs_head structure is now deprecated, it has been used by some user space tools. Its removel in commit [ac8dde1: “Add flags to descriptors block”] was an oversight leading to build breakage for such tools. Bring it back so that old user space tools can still be build without problems on newer kernel versions. Cc: <stable@vger.kernel.org> # 3.14 Reported-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Reported-by: Krzysztof Opasiak <k.opasiak@samsung.com> Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* | Revert "tools: ffs-test: convert to new descriptor format fixing compilation ↵Felipe Balbi2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | error" This reverts commit f2af74123f8c5a735248547f4286a3adc28633c1. There is a better fix for this build error coming in a following patch. Signed-of-by: Felipe Balbi <balbi@ti.com>
* | tools: ffs-test: convert to new descriptor format fixing compilation errorMichal Nazarewicz2014-06-191-1/+1
|/ | | | | | | | | | | | | | | | | | | | Commit [ac8dde11: “usb: gadget: f_fs: Add flags to descriptors block”] which introduced a new descriptor format for FunctionFS removed the usb_functionfs_descs_head structure, which is still used by ffs-test. tool. Convert ffs-test by converting it to use the new header format. For testing kernels prior to 3.14 (when the new format was introduced) and parsing of the legacy headers in the new kernels, provide a compilation flag to make the tool use the old format. Finally, include information as to when the legacy FunctionFS headers format has been deprecated (which is also when the new one has been introduced). Reported-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* USB: cdc-wdm: properly include types.hGreg Kroah-Hartman2014-05-271-0/+2
| | | | | | | | | | The file include/uapi/linux/usb/cdc-wdm.h uses a __u16 so it needs to include types.h as well to make the build system happy. Fixes: 3edce1cf813a ("USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMAND") Cc: stable <stable@vger.kernel.org> # 3.10+ Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* usb: cdc-wdm: export cdc-wdm uapi headerBjørn Mork2014-05-271-0/+1
| | | | | | | | | | The include/uapi/linux/usb/cdc-wdm.h header defines cdc-wdm userspace APIs and should be exported by make headers_install. Cc: <stable@vger.kernel.org> # 3.10, 3.12, 3.14 Fixes: 3edce1cf813a ("USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMAND") Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-021-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pull networking updates from David Miller: "Here is my initial pull request for the networking subsystem during this merge window: 1) Support for ESN in AH (RFC 4302) from Fan Du. 2) Add full kernel doc for ethtool command structures, from Ben Hutchings. 3) Add BCM7xxx PHY driver, from Florian Fainelli. 4) Export computed TCP rate information in netlink socket dumps, from Eric Dumazet. 5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas Dichtel. 6) Convert many drivers to pci_enable_msix_range(), from Alexander Gordeev. 7) Record SKB timestamps more efficiently, from Eric Dumazet. 8) Switch to microsecond resolution for TCP round trip times, also from Eric Dumazet. 9) Clean up and fix 6lowpan fragmentation handling by making use of the existing inet_frag api for it's implementation. 10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss. 11) Auto size SKB lengths when composing netlink messages based upon past message sizes used, from Eric Dumazet. 12) qdisc dumps can take a long time, add a cond_resched(), From Eric Dumazet. 13) Sanitize netpoll core and drivers wrt. SKB handling semantics. Get rid of never-used-in-tree netpoll RX handling. From Eric W Biederman. 14) Support inter-address-family and namespace changing in VTI tunnel driver(s). From Steffen Klassert. 15) Add Altera TSE driver, from Vince Bridgers. 16) Optimizing csum_replace2() so that it doesn't adjust the checksum by checksumming the entire header, from Eric Dumazet. 17) Expand BPF internal implementation for faster interpreting, more direct translations into JIT'd code, and much cleaner uses of BPF filtering in non-socket ocntexts. From Daniel Borkmann and Alexei Starovoitov" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits) netpoll: Use skb_irq_freeable to make zap_completion_queue safe. net: Add a test to see if a skb is freeable in irq context qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port' net: ptp: move PTP classifier in its own file net: sxgbe: make "core_ops" static net: sxgbe: fix logical vs bitwise operation net: sxgbe: sxgbe_mdio_register() frees the bus Call efx_set_channels() before efx->type->dimension_resources() xen-netback: disable rogue vif in kthread context net/mlx4: Set proper build dependancy with vxlan be2net: fix build dependency on VxLAN mac802154: make csma/cca parameters per-wpan mac802154: allow only one WPAN to be up at any given time net: filter: minor: fix kdoc in __sk_run_filter netlink: don't compare the nul-termination in nla_strcmp can: c_can: Avoid led toggling for every packet. can: c_can: Simplify TX interrupt cleanup can: c_can: Store dlc private can: c_can: Reduce register access can: c_can: Make the code readable ...
| * USB: cdc: add MBIM extended functional descriptor structureBen Chan2014-03-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | This patch adds the MBIM extended functional descriptor structure defined in "Universal Serial Bus Communications Class Subclass Specification for Mobile Broadband Interface Model, Revision 1.0, Errata-1" published by USB-IF. Signed-off-by: Ben Chan <benchan@chromium.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* | usb: gadget: f_fs: Add flags to descriptors blockMichal Nazarewicz2014-03-051-19/+30
| | | | | | | | | | | | | | | | | | | | This reworks the way SuperSpeed descriptors are added and instead of having a magic after full and high speed descriptors, it reworks the whole descriptors block to include a flags field which lists which descriptors are present and makes future extensions possible. Signed-off-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* | usb: gadget: f_fs: Add support for SuperSpeed ModeManu Gautam2014-03-051-0/+5
|/ | | | | | | | | | | | | Allow userspace to pass SuperSpeed descriptors and handle them in the driver accordingly. This change doesn't modify existing desc_header and thereby keeps the ABI changes backward compatible i.e. existing userspace drivers compiled with old header (functionfs.h) would continue to work with the updated kernel. Signed-off-by: Manu Gautam <mgautam@codeaurora.org> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
* USB: move the definition of USB_MAXCHILDRENAlan Stern2013-07-161-0/+11
| | | | | | | | | | | | | The USB_MAXCHILDREN symbol is used in include/uapi/linux/usb/ch11.h, a user-mode header, even though it is defined in include/linux/usb.h, which is kernel-only. This causes compile-time errors when user programs try to #include linux/usb/ch11.h. This patch fixes the problem by moving the definition of USB_MAXCHILDREN into ch11.h. It also gets rid of unneeded parentheses. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* USB: fix an incorrect table index in commentHuang Rui2013-04-081-2/+2
| | | | | Signed-off-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMANDBjørn Mork2013-03-251-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Userspace applications need to know the maximum supported message size. The cdc-wdm driver translates between a character device stream and a message based protocol. Each message is transported as a usb control message with no further encapsulation or syncronization. Each read or write on the character device should translate to exactly one usb control message to ensure that message boundaries are kept intact. That means that the userspace application must know the maximum message size supported by the device and driver, making this size a vital part of the cdc-wdm character device API. CDC WDM and CDC MBIM functions export the maximum supported message size through CDC functional descriptors. The cdc-wdm and cdc_mbim drivers will parse these descriptors and use the value chosen by the device. The only current way for a userspace application to retrive the value is by duplicating the descriptor parsing. This is an unnecessary complex task, and application writers are likely to postpone it, using a fixed value and adding a "todo" item. QMI functions have no way to tell the host what message size they support. The qmi_wwan driver use a fixed value based on protocol recommendations and observed device behaviour. Userspace applications must know and hard code the same value. This scheme will break if we ever encounter a QMI device needing a device specific message size quirk. We are currently unable to support such a device because using a non default size would break the implicit userspace API. The message size is currently a hidden attribute of the cdc-wdm userspace API. Retrieving it is unnecessarily complex, increasing the possibility of drivers and applications using different limits. The resulting errors are hard to debug, and can only be replicated on identical hardware. Exporting the maximum message size from the driver simplifies the task for the userspace application, and creates a unified information source independent of device and function class. It also serves to document that the message size is part of the cdc-wdm userspace API. This proposed API extension has been presented for the authors of userspace applications and libraries using the current API: libmbim, libqmi, uqmi, oFono and ModemManager. The replies were: Aleksander Morgado: "We do really need max message size for MBIM; and as you say, it may be good to have the max message size info also for QMI, so the new ioctl seems a good addition. So +1 from my side, for what it's worth." Dan Williams: "Yeah, +1 here. I'd prefer the sysfs file, but the fact that that doesn't work for fd passing pretty much kills it." No negative replies are so far received. Cc: Aleksander Morgado <aleksander@lanedo.com> Cc: Dan Williams <dcbw@redhat.com> Signed-off-by: Bjørn Mork <bjorn@mork.no> Acked-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* ALSA: usb: Fix Processing Unit Descriptor parsersPawel Moll2013-02-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 99fc86450c439039d2ef88d06b222fd51a779176 "ALSA: usb-mixer: parse descriptors with structs" introduced a set of useful parsers for descriptors. Unfortunately the parses for the Processing Unit Descriptor came with a very subtle bug... Functions uac_processing_unit_iProcessing() and uac_processing_unit_specific() were indexing the baSourceID array forgetting the fields before the iProcessing and process-specific descriptors. The problem was observed with Sound Blaster Extigy mixer, where nNrModes in Up/Down-mix Processing Unit Descriptor was accessed at offset 10 of the descriptor (value 0) instead of offset 15 (value 7). In result the resulting control had interesting limit values: Simple mixer control 'Channel Routing Mode Select',0 Capabilities: volume volume-joined penum Playback channels: Mono Capture channels: Mono Limits: 0 - -1 Mono: -1 [100%] Fixed by starting from the bmControls, which was calculated correctly, instead of baSourceID. Now the mentioned control is fine: Simple mixer control 'Channel Routing Mode Select',0 Capabilities: volume volume-joined penum Playback channels: Mono Capture channels: Mono Limits: 0 - 6 Mono: 0 [0%] Signed-off-by: Pawel Moll <mail@pawelmoll.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* usb: Using correct way to clear usb3.0 device's remote wakeup feature.Lan Tianyu2013-01-241-0/+6
| | | | | | | | | | | | | | | | | | Usb3.0 device defines function remote wakeup which is only for interface recipient rather than device recipient. This is different with usb2.0 device's remote wakeup feature which is defined for device recipient. According usb3.0 spec 9.4.5, the function remote wakeup can be modified by the SetFeature() requests using the FUNCTION_SUSPEND feature selector. This patch is to use correct way to disable usb3.0 device's function remote wakeup after suspend error and resuming. This should be backported to kernels as old as 3.4, that contain the commit 623bef9e03a60adc623b09673297ca7a1cdfb367 "USB/xhci: Enable remote wakeup for USB3 devices." Signed-off-by: Lan Tianyu <tianyu.lan@intel.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: stable@vger.kernel.org
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-11-1011-0/+3264
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
| * UAPI: (Scripted) Disintegrate include/linux/usbDavid Howells2012-10-0911-0/+3241
|/ | | | | | | | | Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
* UAPI: (Scripted) Set up UAPI Kbuild filesDavid Howells2012-10-021-0/+1
Set up empty UAPI Kbuild files to be populated by the header splitter. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>