tree bbb15cbf36e18d20db41334bb363300b23b36645
parent 8f7abcadf29e4b9eb63e17113b9ceb28e2e6eb1b
parent bdfaf54dc4c9060ef10eccbeab9ac58fc20103df
author Alexander Martinz <amartinz@shiftphones.com> 1663776359 +0200
committer Alexander Martinz <amartinz@shiftphones.com> 1663854440 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEioN3RtFSeUXyJOKbzxW92aMhqbIFAmMsZ28ACgkQzxW92aMh
 qbJRWBAAiJEUnf2qUcZK8tqs05pj2RKg8jEf1e9Xb6Ga5zg+TT/MIt7l18/tUl25
 4+6A8BDHyD3fKfAi2t4Vpdicf8XIsDUwxWPMvU5hphWy/AlMHzeUfJsU/PO7kJ6K
 gt2XaHVR0pc27fW6cMNnSeRaILRy7Ad5mwLAQI1w4AaTwlzlb1zYiF1temuf7Dao
 vaLUFhwEmSceERtciSIlFx2qpN5CvXUTSEj3fPWaMOYyQ5AUmm8+IHhOhNPdBbVV
 8vRmBWQp8BHDAUZfl6zICSxXzld4ilxQOrsGnKXV14GBZivOKuB6R7TdUVSLiztz
 XC8QUSWMosVUeh6YSK1w4gL9KopC0lLd83zVNlat4nZkSWoR+8+5PYwp+1XBu9dt
 nlhB909qBbVn/615kf4LWrNgi2KDTXTaOP6nBjEkj8cNzBWtzjg0cqDIejEIeYAh
 a/J+z2V6tQzetrZLdxOlNIF+O+PQFvBepMkVh31fP1uzcBb7hd9YpbfUr8lb8oMT
 CVHenSAaFYAIXuHLdqNSRo4H2CFU0fBLPThBIvNP09QyFdoiBGGpG6mc8AR0KYUz
 iqNqH1/rro7CP9B3lMhI8asMZ/t9mzvwZmRQB3FR968bulyCM/kTFgbKJd+P4Y0g
 jkU0kR0y09Zbkoz6EstE3Fn1wD/MPU7Wh0Ax7BdGEkQO5Nptk9w=
 =qZ4y
 -----END PGP SIGNATURE-----

Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into sos-3.x

-----

Merge list:

bdfaf54dc4c9 Merge 4.9.329 into android-4.9-q
4783567f84fa Merge 4.9.328 into android-4.9-q
34634df648e6 Linux 4.9.329
5bc5da2ae8fa tracefs: Only clobber mode/uid/gid on remount if asked
2401f7ad9717 mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
d4842b55fdf7 platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes
6c9d1b1be8f7 ieee802154: cc2520: add rc code in cc2520_tx()
8134d20db6e4 tg3: Disable tg3 device on system reboot to avoid triggering AER
cacdc222f2a7 HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo
66b716cbd07b drm/msm/rd: Fix FIFO-full deadlock
61215215bae7 Linux 4.9.328
026d5586522a SUNRPC: use _bh spinlocking on ->transport_lock
a260a029d7d1 MIPS: loongson32: ls1c: Fix hang during startup
55db1f46f0bf usb: dwc3: fix PHY disable sequence
9f6a1f63ad7b sch_sfb: Also store skb len before calling child enqueue
be8176c25c32 tcp: fix early ETIMEDOUT after spurious non-SACK RTO
f4d04a991d23 tipc: fix shift wrapping bug in map_get()
b5aa83141aa9 sch_sfb: Don't assume the skb is still around after enqueueing to child
eb4d8d6b44a2 netfilter: nf_conntrack_irc: Fix forged IP logic
92c4fe831a72 netfilter: br_netfilter: Drop dst references before setting.
d574fee3d4ff driver core: Don't probe devices after bus_type.match() probe deferral
b8fc9e91b931 scsi: mpt3sas: Fix use-after-free warning
b970518014f2 ALSA: usb-audio: Fix an out-of-bounds bug in __snd_usb_parse_audio_interface()
7b3e2cb46f01 ALSA: aloop: Fix random zeros in capture data when using jiffies timer
637c5310acb4 ALSA: emu10k1: Fix out of bounds access in snd_emu10k1_pcm_channel_alloc()
463670f98048 fbdev: chipsfb: Add missing pci_disable_device() in chipsfb_pci_init()
f6c72233e2f0 parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines
d38fb2984cea parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources()
b878da58df2c drm/radeon: add a force flush to delay work when radeon
730233be0f7c Revert "mm: kmemleak: take a full lowmem check in kmemleak_*_phys()"
758105a4361d fs: only do a memory barrier for the first set_buffer_uptodate()
c34f890629dc ALSA: seq: Fix data-race at module auto-loading
9d8b475df8f7 ALSA: seq: oss: Fix data-race for max_midi_devs access
a8758c8a5662 net: mac802154: Fix a condition in the receive path
cdb9a8da9b84 wifi: mac80211: Don't finalize CSA in IBSS mode if state is disconnected
84ef06d2a846 usb: gadget: mass_storage: Fix cdrom data transfers on MAC-OS
d90419b8b832 USB: core: Prevent nested device-reset calls
5e28b1cbc5ce s390: fix nospec table alignments
0db07bfcb52c s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages
21a277d2d89c usb-storage: Add ignore-residue quirk for NXP PN7462AU
b420f94e3ee3 USB: cdc-acm: Add Icom PMR F3400 support (0c26:0020)
a1fa4cdaa948 USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode
72e8abe1049a USB: serial: option: add support for OPPO R11 diag port
ef6b8d33758e USB: serial: cp210x: add Decagon UCA device id
e7a5c01912cc xhci: Add grace period after xHC start to prevent premature runtime suspend.
e9f6972ab40a hwmon: (gpio-fan) Fix array out of bounds access
f7552ba150b2 USB: serial: ftdi_sio: add Omron CS1W-CIF31 device id
c555cf04684f vt: Clear selection before changing the font
7dce6b0ee7d7 staging: rtl8712: fix use after free bugs
29689973f143 serial: fsl_lpuart: RS485 RTS polariy is inverse
8dbc7a77d784 wifi: cfg80211: debugfs: fix return type in ht40allow_map_read()
23f8ce989ff6 platform/x86: pmc_atom: Fix SLP_TYPx bitfield mask
6577e903a9e1 fbdev: fb_pm2fb: Avoid potential divide by zero error
1f866c53ec6c Merge 4.9.327 into android-4.9-q
66dd212d9c3b Linux 4.9.327
19cd630712e7 kprobes: don't call disarm_kprobe() for disabled kprobes
c24ca0f17290 mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse
e7a5ead5a469 netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y
4a06817ce7ef s390/hypfs: avoid error message under KVM
3e930a2deac2 arm64: map FDT as RW for early_init_dt_scan()
8569b4ada1e0 ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead
0f1174f4972e fbdev: fb_pm2fb: Avoid potential divide by zero error
1bea0bbf6600 HID: hidraw: fix memory leak in hidraw_release()
2fe46195d2f0 media: pvrusb2: fix memory leak in pvr_probe
e887ea3d6935 Bluetooth: L2CAP: Fix build errors in some archs
583daae6b049 kbuild: Fix include path in scripts/Makefile.modpost
0616411a704a x86/bugs: Add "unknown" reporting for MMIO Stale Data
1a2429c45ddd x86/cpu: Add Tiger Lake to Intel family
210d22b7480b s390/mm: do not trigger write fault when vma does not allow VM_WRITE
390f33a95419 mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
9ac3240faa3d mm/hugetlb: fix hugetlb not supporting softdirty tracking
6a0108b13706 asm-generic: sections: refactor memory_intersects
18e28817cb51 loop: Check for overflow while configuring loop
d1f0467fd6f3 btrfs: check if root is readonly while setting security xattr
4e465ee46f45 ixgbe: stop resetting SYSTIME in ixgbe_ptp_start_cyclecounter
29e01227e3fc net: Fix a data-race around sysctl_somaxconn.
add7c2af16bb net: Fix a data-race around sysctl_net_busy_read.
7a34fb980e4d net: Fix a data-race around sysctl_net_busy_poll.
64fca2207e06 net: Fix a data-race around sysctl_tstamp_allow_data.
509c21ea2776 ratelimit: Fix data-races in ___ratelimit().
3cfdaa30d3e2 netfilter: nft_payload: report ERANGE for too long offset and length
4eec561ac23c bonding: 802.3ad: fix no transmission of LACPDUs
76885373129b rose: check NULL rose_loopback_neigh->loopback
e580d3201ed2 af_key: Do not call xfrm_probe_algs in parallel
18e6b6e2555c xfrm: fix refcount leak in __xfrm_policy_check()
555666fd6d7f parisc: Fix exception handler for fldw and fstw instructions
33296e8a8113 Merge 4.9.326 into android-4.9-q
c97531caf70f Linux 4.9.326
5134b0a196ec MIPS: tlbex: Explicitly compare _PAGE_NO_EXEC against 0
59cefb583c98 video: fbdev: i740fb: Check the argument of i740_calc_vclk()
c4ced9fd1007 powerpc/64: Init jump labels before parse_early_param()
900c508f6d15 ALSA: timer: Use deferred fasync helper
6cc1e76104fd ALSA: core: Add async signal helpers
9d1afa0169a8 mips: cavium-octeon: Fix missing of_node_put() in octeon2_usb_clocks_start
62a50c36d450 vfio: Clear the caps->buf to NULL after free
8245e7d1d7f7 tty: serial: Fix refcount leak bug in ucc_uart.c
53f62a4201be ext4: avoid resizing to a partial cluster size
835f95d67760 ext4: avoid remove directory when directory is corrupted
7470a4314b23 drivers:md:fix a potential use-after-free bug
c2c7a29f9978 cxl: Fix a memory leak in an error handling path
67a487446142 gadgetfs: ep_io - wait until IRQ finishes
fe6fe6440371 usb: host: ohci-ppc-of: Fix refcount leak bug
f465d468c5a0 irqchip/tegra: Fix overflow implicit truncation warnings
123f45996719 fec: Fix timer capture timing in `fec_ptp_enable_pps()`
78913e29ab54 netfilter: nf_tables: really skip inactive sets when allocating name
53d607516459 nios2: add force_successful_syscall_return()
d264b646ea0d nios2: restarts apply only to the first sigframe we build...
bcb306aadd9f nios2: fix syscall restart checks
60cd5c1a0667 nios2: traced syscall does need to check the syscall number
8c7739f57084 nios2: don't leave NULLs in sys_call_table[]
c0710869c3ce nios2: page fault et.al. are *not* restartable syscalls...
acf173d9e278 atm: idt77252: fix use-after-free bugs caused by tst_timer
adc7242e1d0c xen/xenbus: fix return type in xenbus_file_read()
09fc7ffdf11d vsock: Fix memory leak in vsock_connect()
3f2de0cd2ba3 pinctrl: qcom: msm8916: Allow CAMSS GP clocks to be muxed
81abaab5a4b8 pinctrl: nomadik: Fix refcount leak in nmk_pinctrl_dt_subnode_to_map
6d8453df84f1 SUNRPC: Reinitialise the backchannel request buffers before reuse
d908b2604ec9 NFSv4.1: RECLAIM_COMPLETE must handle EACCES
223a267bea84 can: ems_usb: fix clang's -Wunaligned-access warning
8d6795ecb3ef btrfs: fix lost error handling when looking up extended ref on log replay
e303213d48fd ata: libata-eh: Add missing command name
373ecb1875bb rds: add missing barrier to release_refill
7bb985e57269 ALSA: info: Fix llseek return value when using callback
d4efba5f29e9 net_sched: cls_route: disallow handle of 0
64e0fb3f7836 net/9p: Initialize the iounit field during fid creation
ab0d710b129f nios2: time: Read timer in get_cycles only if initialized
33f4098a7fd5 Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
df0cd6538f58 Revert "net: usb: ax88179_178a needs FLAG_SEND_ZLP"
bbc118acf7ba scsi: sg: Allow waiting for commands to complete on removed device
ec9b323094ce tcp: fix over estimation in sk_forced_mem_schedule()
cec1c921fcc5 btrfs: reject log replay if there is unsupported RO compat flag
34a475425612 net_sched: cls_route: remove from list when handle is 0
1ae0ebfb576b dm raid: fix address sanitizer warning in raid_status
f336fd3c4be9 ext4: correct max_inline_xattr_value_size computing
2a6005425f5f ext4: fix extent status tree race in writeback error recovery path
257974962d4a ext4: update s_overhead_clusters in the superblock during an on-line resize
9337f3877a5f ext4: fix use-after-free in ext4_xattr_set_entry
b77dd5b2c582 ext4: make sure ext4_append() always allocates new block
214c68423fd6 ext4: add EXT4_INODE_HAS_XATTR_SPACE macro in xattr.h
80f7c93e573e spmi: trace: fix stack-out-of-bound access in SPMI tracing functions
e0a17000554e x86/olpc: fix 'logical not is only applied to the left hand side'
7008a266c12c scsi: zfcp: Fix missing auto port scan and thus missing target ports
ef6b262e551d netfilter: nf_tables: fix null deref due to zeroed list head
77057007feee USB: HCD: Fix URB giveback issue in tasklet function
d3ac4e47510e MIPS: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
78bce8fdeeed powerpc/powernv: Avoid crashing if rng is NULL
1bba735ddf2a powerpc/fsl-pci: Fix Class Code of PCIe Root Port
289626aa735d PCI: Add defines for normal and subtractive PCI bridges
b01dcf4447d4 ia64, processor: fix -Wincompatible-pointer-types in ia64_get_irr()
75fbd370a2ce md-raid10: fix KASAN warning
8f68eb5272e8 fuse: limit nsec
25eb77cc734e bpf: fix overflow in prog accounting
8993aa9dd56c drm/nouveau: fix another off-by-one in nvbios_addr
3be17b2d7438 parisc: Fix device names in /proc/iomem
d2d6b530d89b usbnet: Fix linkwatch use-after-free on disconnect
349c0497417f vfs: Check the truncate maximum size in inode_newsize_ok()
1f5a7e4fbf38 ALSA: hda/cirrus - support for iMac 12,1 model
eba3232c2187 ALSA: hda/conexant: Add quirk for LENOVO 20149 Notebook model
85c0a088ab42 KVM: x86: Mark TSS busy during LTR emulation _after_ all fault checks
2c49adeb0209 KVM: SVM: Don't BUG if userspace injects an interrupt with GIF=0
a0600449b7c2 add barriers to buffer_uptodate and set_buffer_uptodate
a718eba7e458 ALSA: bcd2000: Fix a UAF bug on the error path of probing
80bd079f4274 macintosh/adb: fix oob read in do_adb_query() function
f0c556f4b05e random: only call boot_init_stack_canary() once
d1793d003955 ACPI: video: Shortening quirk list by identifying Clevo by board_name only
a5ace3271fa8 ACPI: video: Force backlight native for some TongFang devices
0a94ca6608a1 init/main.c: extract early boot entropy from the passed cmdline
af49d0e6feee init: move stack canary initialization after setup_arch
3cacffd4d5b8 init/main: properly align the multi-line comment
3b2f98d484b2 init/main: Fix double "the" in comment
70a2b359ead8 include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
381595049d2f selinux: fix inode_doinit_with_dentry() LABEL_INVALID error handling
c00fcec32cd2 selinux: fix error initialization in inode_doinit_with_dentry()
4ec11eb727da selinux: Convert isec->lock into a spinlock
ac17e88ff04f selinux: Clean up initialization of isec->sclass
891160f1661f proc: Pass file mode to proc_pid_make_inode
81000b69e45e selinux: Minor cleanups
99b85a87b19c ion: Make user_ion_handle_put_nolock() a void function
b7af7d6459de mt7601u: add USB device ID for some versions of XiaoDu WiFi Dongle.
bfc21aedbd05 ARM: crypto: comment out gcc warning that breaks clang builds
3b3e2de46232 netfilter: nf_queue: do not allow packet truncation below transport header offset
a4ed27912074 net: sungem_phy: Add of_node_put() for reference returned by of_get_parent()
dd3fdf3b35e7 net: ping6: Fix memleak in ipv6_renew_options().
8e8bbc136232 scsi: ufs: host: Hold reference returned by of_parse_phandle()
d2bb6a9b8bae ntfs: fix use-after-free in ntfs_ucsncmp()
d255c861e268 Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put
699e4947e350 FROMLIST: binder: fix UAF of ref->proc caused by race condition
5a227d815cd3 Merge 4.9.325 into android-4.9-q
9645f707f4e6 Linux 4.9.325
1b1cf809a7e6 net: usb: ax88179_178a needs FLAG_SEND_ZLP
41ce14090db9 tty: use new tty_insert_flip_string_and_push_buffer() in pty_write()
f031009ddfa3 tty: extract tty_flip_buffer_commit() from tty_flip_buffer_push()
e39085b8b75a tty: drop tty_schedule_flip()
0a67b4a8e2ae tty: the rest, stop using tty_schedule_flip()
cb865337fbd7 tty: drivers/tty/, stop using tty_schedule_flip()
f52ac912c14c ALSA: memalloc: Align buffer allocations in page size
5cfdb4f1e3cc bpf: Make sure mac_header was set before using it
5735845906fb mm/mempolicy: fix uninit-value in mpol_rebind_policy()
2bbc39ce7809 Revert "Revert "char/random: silence a lockdep splat with printk()""
a5a8fc0679a8 be2net: Fix buffer overflow in be_get_module_eeprom
91e21df688f8 tcp: Fix a data-race around sysctl_tcp_notsent_lowat.
be120ad89235 igmp: Fix a data-race around sysctl_igmp_max_memberships.
a84b4afaca25 igmp: Fix data-races around sysctl_igmp_llm_reports.
09158cb3dc01 i2c: cadence: Change large transfer count reset logic to be unconditional
9b5dc7ad6da1 tcp: Fix a data-race around sysctl_tcp_probe_threshold.
13207f9485b5 tcp/dccp: Fix a data-race around sysctl_tcp_fwmark_accept.
fc92e3b4bebf ip: Fix a data-race around sysctl_fwmark_reflect.
3bbd86809928 perf/core: Fix data race between perf_event_set_output() and perf_mmap_close()
b4d224eec96a power/reset: arm-versatile: Fix refcount leak in versatile_reboot_probe
5aff12fa0950 xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup()
2994afca324a misc: rtsx_usb: set return value in rsp_buf alloc err path
242335b46678 misc: rtsx_usb: use separate command and response buffers
1a6af9d85019 misc: rtsx_usb: fix use of dma mapped buffer for usb bulk transfer
45ce2e46f2cf xen/gntdev: Ignore failure to unmap INVALID_GRANT_HANDLE
ab83798bd5a3 security,selinux,smack: kill security_task_wait hook
b95f704b990f FROMGIT: arm64: fix oops in concurrently setting insn_emulation sysctls
a64916631a99 Merge 4.9.324 into android-4.9-q
65be5f5665a5 Linux 4.9.324
d93ed9aff649 can: m_can: m_can_tx_handler(): fix use after free of skb
e3a3bfdbb4b2 mm: invalidate hwpoison page cache page in fault path
f7a4aabcb3ac serial: 8250: fix return error code in serial8250_request_std_resource()
b0b882a42380 tty: serial: samsung_tty: set dma burst_size to 1
ad2f765bd451 usb: dwc3: gadget: Fix event pending check
c5c1ed947a76 USB: serial: ftdi_sio: add Belimo device ids
c5a7f9549703 signal handling: don't use BUG_ON() for debugging
b3d7c509bcbd x86: Clear .brk area at early boot
419311dd4aef ASoC: wm5110: Fix DRE control
c89e8f54fe93 ASoC: ops: Fix off by one in range control validation
baab719836cf NFC: nxp-nci: don't print header length mismatch on i2c error
638fa20b618b net: tipc: fix possible refcount leak in tipc_sk_create()
4f242486bf46 cpufreq: pmac32-cpufreq: Fix refcount leak bug
840d81ff43a2 virtio_mmio: Restore guest page size on resume
5c58e0529670 virtio_mmio: Add missing PM calls to freeze/restore
d9840212a9c0 sfc: fix kernel panic when creating VF
3199e34912d8 sfc: fix use after free when disabling sriov
c3b596eb8b4b ipv4: Fix data-races around sysctl_ip_dynaddr.
1740e5922fbb icmp: Fix data-races around sysctl.
2764f82bbc15 cipso: Fix data-races around sysctl.
93231fe7dc03 ARM: 9209/1: Spectre-BHB: avoid pr_info() every time a CPU comes out of idle
c1fabc0d00e0 net: dsa: bcm_sf2: force pause link settings
0681d5b37a52 nilfs2: fix incorrect masking of permission flags for symlinks
83d514c9d8cc ARM: 9213/1: Print message about disabled Spectre workarounds only once
9b05f0803267 net: sock: tracing: Fix sock_exceed_buf_limit not to dereference stale pointer
c0fcceb5f3f1 xen/netback: avoid entering xenvif_rx_next_skb() with an empty rx queue
021f36d95625 ALSA: hda - Add fixup for Dell Latitidue E5430
7b2290c612c4 arm64: entry: Restore tramp_map_kernel ISB
bd775575bf6c Merge 4.9.323 into android-4.9-q
dadca36da717 Linux 4.9.323
349259a34787 dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate
452b9dfd7aca dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate
deb71c047958 dmaengine: at_xdma: handle errors of at_xdmac_alloc_desc() correctly
a0775288e8f0 ida: don't use BUG_ON() for debugging
7b8751ed208d i2c: cadence: Unregister the clk notifier in error path
63e1df61c8f5 pinctrl: sunxi: a83t: Fix NAND function name for some pins
7c0119a0014f xfs: remove incorrect ASSERT in xfs_rename
1139897fc21c video: of_display_timing.h: include errno.h
7332d6d4b262 iommu/vt-d: Fix PCI bus rescan device hot add
625425bc8934 net: rose: fix UAF bug caused by rose_t0timer_expiry
3eed421ca5c8 usbnet: fix memory leak in error case
339fa9f80d3b can: gs_usb: gs_usb_open/close(): fix memory leak
df412b013517 can: grcan: grcan_probe(): remove extra of_node_get()
308c6d0e1f20 mm/slub: add missing TID updates on slab deactivation
e5b48fd08ef5 Merge 4.9.322 into android-4.9-q
445514206988 Linux 4.9.322
abc8b899f312 net: usb: qmi_wwan: add Telit 0x1070 composition
a8ca6326a7b3 net: usb: qmi_wwan: add Telit 0x1060 composition
cd7f1b31f1d2 net: usb: qmi_wwan: add Telit LE910Cx 0x1230 composition
d9c6caf6af0a net: usb: qmi_wwan: add Telit 0x1260 and 0x1261 compositions
cf1d2a01b19b qmi_wwan: Added support for Telit LN940 series
856d1b8e6e82 xen/arm: Fix race in RB-tree based P2M accounting
8dad9a671002 xen/blkfront: force data bouncing when backend is untrusted
c6e941364608 xen/netfront: force data bouncing when backend is untrusted
d1d69e0c838c xen/netfront: fix leaking data in shared pages
4fbda9d1fc77 xen/blkfront: fix leaking data in shared pages
b0740b251ef3 net: Rename and export copy_skb_header
bb5584c25b7c ipv6/sit: fix ipip6_tunnel_get_prl return value
c74f0e0243cb sit: use min
35bff23a05a1 hwmon: (ibmaem) don't call platform_device_del() if platform_device_add() fails
36cd49b071fc xen/gntdev: Avoid blocking in unmap_grant_pages()
46a815b9a0dc NFC: nxp-nci: Don't issue a zero length i2c_master_read()
8d7d1541f9a1 nfc: nfcmrvl: Fix irq_of_parse_and_map() return value
a853b7a3a9fd net: bonding: fix use-after-free after 802.3ad slave unbind
ec7269b217c1 net: bonding: fix possible NULL deref in rlb code
765da0358631 netfilter: nft_dynset: restore set element counter when failing to update
eaaa59aed339 caif_virtio: fix race between virtio_device_ready() and ndo_open()
432e008337ae powerpc/powernv: wire up rng during setup_arch
671191cee354 usbnet: fix memory allocation in helpers
5e69b6a25bef usbnet: make sure no NULL pointer is passed through
4fe8dcf91b25 net: usb: ax88179_178a: Fix packet receiving
3ab68a952878 net: rose: fix UAF bugs caused by timer handler
cc817b7ae308 SUNRPC: Fix READ_PLUS crasher
2d4e7c9898c2 dm raid: fix KASAN warning in raid5_add_disks
47df8523daf1 Merge 4.9.321 into android-4.9-q
f52c80ec2261 Linux 4.9.321
84fb3b1d1386 swiotlb: skip swiotlb_bounce when orig_addr is zero
3f860199f364 kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]
eb581547157c fdt: Update CRC check for rng-seed
c0d076419136 xen: unexport __init-annotated xen_xlate_map_ballooned_pages()
8642aef2bf4b drm: remove drm_fb_helper_modinit
a2f8cfa63f55 powerpc/pseries: wire up rng during setup_arch()
1b9980fb24f6 modpost: fix section mismatch check for exported init/exit sections
b8b84e01ca94 ARM: cns3xxx: Fix refcount leak in cns3xxx_init
a9b76c232a1c ARM: Fix refcount leak in axxia_boot_secondary
545ae5cbae83 ARM: exynos: Fix refcount leak in exynos_map_pmu
fead9b2f6498 ARM: dts: imx6qdl: correct PU regulator ramp delay
9c58e6d86689 powerpc: Enable execve syscall exit tracepoint
3e5eb904d9ba xtensa: Fix refcount leak bug in time.c
b12d5c52f073 xtensa: xtfpga: Fix refcount leak bug in setup
d6111e7bdb8e iio: trigger: sysfs: fix use-after-free on remove
9a23cf5bcdd8 iio: accel: mma8452: ignore the return value of reset operation
0108c1ac7734 iio:accel:bma180: rearrange iio trigger get and register
47014a0e13fd usb: chipidea: udc: check request status before setting device address
6eabb3021b7f iio: adc: vf610: fix conversion mode sysfs node name
b7fad5768715 igb: Make DMA faster when CPU is active on the PCIe link
0ee4ff6ae161 MIPS: Remove repetitive increase irq_err_count
071dae67bb36 x86/xen: Remove undefined behavior in setup_features()
e503a86ba0e9 bonding: ARP monitor spams NETDEV_NOTIFY_PEERS notifiers
66087addd990 USB: serial: option: add Telit LE910Cx 0x1250 composition
eef98cd1b991 random: quiet urandom warning ratelimit suppression message
f550444427bb dm era: commit metadata in postsuspend after worker stops
243b50984c34 ata: libata: add qc->flags in ata_qc_complete_template tracepoint
826dfd79754e random: schedule mix_interrupt_randomness() less often
dc1421db273b vt: drop old FONT ioctls
6d2329d0ec27 Merge "Merge 4.9.320 into android-4.9-q" into android-4.9-q
ea690b6ba40f Merge 4.9.320 into android-4.9-q
fca92dcc6d02 BACKPORT: l2tp: fix race in pppol2tp_release with session object destroy
82a4bd88b11c BACKPORT: l2tp: don't use inet_shutdown on ppp session destroy
4ffa4be5a14b Linux 4.9.320
a81a6b204a30 tcp: drop the hash_32() part from the index calculation
3c78eea640f6 tcp: increase source port perturb table to 2^16
dd82067bd6ca tcp: dynamically allocate the perturb table used by source ports
aa7722529f6d tcp: add small random increments to the source port
2ed413f140bb tcp: use different parts of the port_offset for index and offset
576696ed0dee secure_seq: use the 64 bits of the siphash for port offset calculation
05a12e5c4063 tcp: add some entropy in __inet_hash_connect()
136b4799419a tcp: change source port randomizarion at connect() time
b79d4d0da659 fuse: fix pipe buffer lifetime for direct_io
fd97de9c7b97 Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""
c132f2ba716b swiotlb: fix info leak with DMA_FROM_DEVICE
ca6226b5c5b4 xprtrdma: fix incorrect header size calculations
26b319152410 s390/mm: use non-quiescing sske for KVM switch to keyed guest
267b8fa3f5bf l2tp: fix race in pppol2tp_release with session object destroy
357fa382bb89 l2tp: don't use inet_shutdown on ppp session destroy
0dc2fca8e4f9 ext4: add reserved GDT blocks check
984ceb2fc8f2 ext4: make variable "count" signed
6880fb2e6433 ext4: fix bug_on ext4_mb_use_inode_pa
93b5acac36cd serial: 8250: Store to lsr_save_flags after lsr read
d85e4e6284a9 usb: gadget: lpc32xx_udc: Fix refcount leak in lpc32xx_udc_probe
85203393d81b USB: serial: io_ti: add Agilent E5805A support
e69721e7f442 USB: serial: option: add support for Cinterion MV31 with new baseline
e8cc56b8d7e2 comedi: vmk80xx: fix expression for tx buffer size
3fe0d94cec04 irqchip/gic-v3: Iterate over possible CPUs by for_each_possible_cpu()
87da903ce632 irqchip/gic/realview: Fix refcount leak in realview_gic_of_init
e804514e8680 misc: atmel-ssc: Fix IRQ check in ssc_probe
a298e888e86c pNFS: Don't keep retrying if the server replied NFS4ERR_LAYOUTUNAVAILABLE
1e0dacdd9366 random: credit cpu and bootloader seeds by default
70b6e2beef36 net: ethernet: mtk_eth_soc: fix misuse of mem alloc interface netdev[napi]_alloc_frag
2cf73c7cb612 ipv6: Fix signed integer overflow in l2tp_ip6_sendmsg
1eb0afecfb9c nfc: nfcmrvl: Fix memory leak in nfcmrvl_play_deferred
78b34fd0d754 virtio-mmio: fix missing put_device() when vm_cmdline_parent registration failed
228ecc2ae817 scsi: lpfc: Fix port stuck in bypassed state after LIP in PT2PT topology
81ed95046f6b scsi: vmw_pvscsi: Expand vcpuHint to 16 bits
d9968d5ffdfe ASoC: wm8962: Fix suspend while playing music
ca4693e6e06e ata: libata-core: fix NULL pointer deref in ata_host_alloc_pinfo()
ef78edd4ef7a ASoC: cs42l56: Correct typo in minimum level for SX volume controls
c30f6af44df7 ASoC: cs42l52: Correct TLV for Bypass Volume
01bc8d947fb1 ASoC: cs53l30: Correct number of volume levels on SX controls
a4cb3d1d2b8f ASoC: cs42l52: Fix TLV scales for mixer controls
0b8e19b40c27 random: account for arch randomness in bits
855aac499edb random: mark bootloader randomness code as __init
dc1485143685 random: avoid checking crng_ready() twice in random_init()
ab62f0f9d32a crypto: drbg - make reseeding from get_random_bytes() synchronous
ba6a98f8c776 crypto: drbg - always try to free Jitter RNG instance
f9d953c3efcb crypto: drbg - move dynamic ->reseed_threshold adjustments to __drbg_seed()
d0ff784dcaa3 crypto: drbg - track whether DRBG was seeded with !rng_is_initialized()
d858a3b1aca6 crypto: drbg - prepare for more fine-grained tracking of seeding state
157f12847d89 crypto: drbg - always seeded with SP800-90B compliant noise source
674ffec1feb1 crypto: drbg - add FIPS 140-2 CTRNG for noise source
37f51eebe80e Revert "random: use static branch for crng_ready()"
db0011b314d6 random: check for signals after page of pool writes
af41143f98f4 random: wire up fops->splice_{read,write}_iter()
fa81f430d059 random: convert to using fops->write_iter()
46eac53a047e random: move randomize_page() into mm where it belongs
434eb68a285f random: move initialization functions out of hot pages
e279897ef075 random: use proper return types on get_random_{int,long}_wait()
9bb0c18aeff8 random: remove extern from functions in header
6de752dc0f55 random: use static branch for crng_ready()
d4f9d62c755e random: credit architectural init the exact amount
47172dad2bf3 random: handle latent entropy and command line from random_init()
d54f11df8cdd random: use proper jiffies comparison macro
3ea5fefec081 random: remove ratelimiting for in-kernel unseeded randomness
39cd44bdb504 random: avoid initializing twice in credit race
87fccf8de1ae random: use symbolic constants for crng_init states
99de0356b3a2 siphash: use one source of truth for siphash permutations
7bbe75d780de random: help compiler out with fast_mix() by using simpler arguments
733917612896 random: do not use input pool from hard IRQs
b60d7cbd6e69 random: order timer entropy functions below interrupt functions
4ca20665c81b random: do not pretend to handle premature next security model
a14dba363dab random: do not use batches when !crng_ready()
1d4ea7af8cad random: insist on random_get_entropy() existing in order to simplify
f4f425f32cd3 uapi: rename ext2_swab() to swab() and share globally in swab.h
fc2a5485e5ec xtensa: use fallback for random_get_entropy() instead of zero
b4cdbb50d892 sparc: use fallback for random_get_entropy() instead of zero
74795d084073 um: use fallback for random_get_entropy() instead of zero
fce24b9f310b x86/tsc: Use fallback for random_get_entropy() instead of zero
df43ba7d7f56 nios2: use fallback for random_get_entropy() instead of zero
d2e76a31c64f arm: use fallback for random_get_entropy() instead of zero
d0038968f8eb mips: use fallback for random_get_entropy() instead of just c0 random
fb4434de3b6a m68k: use fallback for random_get_entropy() instead of zero
bb61b00db2cd timekeeping: Add raw clock fallback for random_get_entropy()
0cf45867fa6c powerpc: define get_cycles macro for arch-override
72b90d9cdfe9 alpha: define get_cycles macro for arch-override
a99753e73cd1 parisc: define get_cycles macro for arch-override
28528a7bebbd s390: define get_cycles macro for arch-override
115d4bd0dee2 ia64: define get_cycles macro for arch-override
9af95dfaa1a8 init: call time_init() before rand_initialize()
daddeef50b22 random: fix sysctl documentation nits
6906938c1cb3 random: document crng_fast_key_erasure() destination possibility
51fc7c5bf5f3 random: make random_get_entropy() return an unsigned long
5f6d77400ca9 random: check for signals every PAGE_SIZE chunk of /dev/[u]random
f68316bb5cb7 random: check for signal_pending() outside of need_resched() check
20039f066081 random: do not allow user to keep crng key around on stack
d1839b8f5a81 random: do not split fast init input in add_hwgenerator_randomness()
dcc2de07f933 random: mix build-time latent entropy into pool at init
c2e2f3287b09 random: re-add removed comment about get_random_{u32,u64} reseeding
817f35f3be93 random: treat bootloader trust toggle the same way as cpu trust toggle
4dd01ce6929e random: skip fast_init if hwrng provides large chunk of entropy
26fb4cddfdb3 random: check for signal and try earlier when generating entropy
b01448758cb0 random: reseed more often immediately after booting
d234795601ae random: make consistent usage of crng_ready()
ede726b1633e random: use SipHash as interrupt entropy accumulator
3ddb66f469d5 random: replace custom notifier chain with standard one
b6dd53be9f05 random: don't let 644 read-only sysctls be written to
ec93b566e617 random: give sysctl_random_min_urandom_seed a more sensible value
c63fce9b6279 random: do crng pre-init loading in worker rather than irq
7adbe3c33ba3 random: unify cycles_t and jiffies usage and types
05ef023f11d2 random: cleanup UUID handling
46aeaf49e28b random: only wake up writers after zap if threshold was passed
4506589f545b random: round-robin registers as ulong, not u32
ed20ec409ec2 random: clear fast pool, crng, and batches in cpuhp bring up
75cc37f461de random: pull add_hwgenerator_randomness() declaration into random.h
f6b013eedc72 hwrng: remember rng chosen by user
42802952a272 hwrng: use rng source with best quality
675d99b9f31d hwrng: core - remove unused PFX macro
2de01a4b424e hwrng: core - Move hwrng miscdev minor number to include/linux/miscdevice.h
62f50335a680 hwrng: core - Rewrite the header
836e91b6c9db hwrng: core - rewrite better comparison to NULL
e1b293341cc3 hwrng: core - do not use multiple blank lines
86591cf98374 random: check for crng_init == 0 in add_device_randomness()
b64adad8495a random: unify early init crng load accounting
b195259cb54d random: do not take pool spinlock at boot
4c22f2c589d9 random: defer fast pool mixing to worker
ac4bbc0a55ad workqueue: make workqueue available early during boot
95b59efc9e94 random: rewrite header introductory comment
a4ec1ffb4624 random: group sysctl functions
3a0a33652ab3 random: group userspace read/write functions
0272b2bf0fa7 random: group entropy collection functions
4c6a6224d246 random: group entropy extraction functions
c792ab87a2b4 random: group initialization wait functions
2c60e61f858b random: remove whitespace and reorder includes
64155f45cdd8 random: remove useless header comment
0b553acf403b random: introduce drain_entropy() helper to declutter crng_reseed()
5401246cd57f random: deobfuscate irq u32/u64 contributions
65e03354493d random: add proper SPDX header
11e8da38f351 random: remove unused tracepoints
0c8771425514 random: remove ifdef'd out interrupt bench
9d436efe2e23 random: tie batched entropy generation to base_crng generation
c1fc9536d031 random: zero buffer after reading entropy from userspace
2ae2d53518f2 random: remove outdated INT_MAX >> 6 check in urandom_read()
508bad0b719b random: use hash function for crng_slow_load()
a0a276481b4d random: absorb fast pool into input pool after fast load
cc7535a0208a random: do not xor RDRAND when writing into /dev/random
4e575837e434 random: ensure early RDSEED goes through mixer on init
6bc282bedfc9 random: inline leaves of rand_initialize()
a07ddc05f919 random: use RDSEED instead of RDRAND in entropy extraction
9924c212e0b2 random: fix locking in crng_fast_load()
90ebbb477d2d random: remove batched entropy locking
a2b4d5b6a3b6 random: remove use_input_pool parameter from crng_reseed()
e7a94af6be9f random: make credit_entropy_bits() always safe
75ec1afb5c68 random: always wake up entropy writers after extraction
316d312ffd38 random: use linear min-entropy accumulation crediting
6820fc472455 random: simplify entropy debiting
bc5f6f0670c5 random: use computational hash for entropy extraction
7b5e3c485bf1 random: only call crng_finalize_init() for primary_crng
b68c62103908 random: access primary_pool directly rather than through pointer
1e78b9755998 random: continually use hwgenerator randomness
e96b8df348a2 random: simplify arithmetic function flow in account()
35a490a35c32 random: access input_pool_data directly rather than through pointer
5501511b3ced random: cleanup fractional entropy shift constants
dbc08ad3ef5e random: prepend remaining pool constants with POOL_
d1c2d8ed7450 random: de-duplicate INPUT_POOL constants
2fe1e7fe8627 random: remove unused OUTPUT_POOL constants
17b4b1295193 random: rather than entropy_store abstraction, use global
1d77add4f600 random: try to actively add entropy rather than passively wait for it
fbf83b78592a random: remove unused extract_entropy() reserved argument
809e9da9c1ca random: remove incomplete last_data logic
ff2063de8a21 random: cleanup integer types
70e975501f90 crypto: chacha20 - Fix chacha20_block() keystream alignment (again)
61de33cef583 random: cleanup poolinfo abstraction
c039ecda6405 random: fix typo in comments
cd120d1dfdef random: don't reset crng_init_cnt on urandom_read()
afec91541862 random: avoid superfluous call to RDRAND in CRNG extraction
e6ae8dda9700 random: early initialization of ChaCha constants
d462ff7fed56 random: initialize ChaCha20 constants with correct endianness
598014d6b8f7 random: use IS_ENABLED(CONFIG_NUMA) instead of ifdefs
17aac85e25d2 random: harmonize "crng init done" messages
e565f3e7530a random: mix bootloader randomness into pool
1d35c20cf023 random: do not re-init if crng_reseed completes before primary init
242dc3744148 random: do not sign extend bytes for rotation when mixing
dbb2c9ca7c50 random: use BLAKE2s instead of SHA1 in extraction
37b962834b29 random: remove unused irq_flags argument from add_interrupt_randomness()
5281a2bac10e random: document add_hwgenerator_randomness() with other input functions
8ade1d8adaeb crypto: blake2s - adjust include guard naming
82fc363160a8 crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
4f5add876481 MAINTAINERS: co-maintain random.c
04cde9a57626 random: remove dead code left over from blocking pool
528333acd95b random: avoid arch_get_random_seed_long() when collecting IRQ randomness
42c54fcc964d random: add arch_get_random_*long_early()
af98d2ae79f0 powerpc: Use bool in archrandom.h
78b28324aac8 linux/random.h: Mark CONFIG_ARCH_RANDOM functions __must_check
2295356d23ce linux/random.h: Use false with bool
cbcd67f44e37 linux/random.h: Remove arch_has_random, arch_has_random_seed
3e5c6758b301 powerpc: Remove arch_has_random, arch_has_random_seed
2e266bef3894 x86: Remove arch_has_random, arch_has_random_seed
c3d17006acb0 random: avoid warnings for !CONFIG_NUMA builds
3c2691868d49 random: split primary/secondary crng init paths
e13ea48b984d random: remove some dead code of poolinfo
221e43c84b02 random: fix typo in add_timer_randomness()
a30bf3c41fca random: Add and use pr_fmt()
6eaeae8da5b2 random: convert to ENTROPY_BITS for better code readability
9587bbd9c078 random: remove unnecessary unlikely()
2de0a1e2c82f random: remove kernel.random.read_wakeup_threshold
892d340ee235 random: delete code to pull data into pools
57908fb8c1f5 random: remove the blocking pool
d776934a0cdc random: fix crash on multiple early calls to add_bootloader_randomness()
6a54da4f7e9e random: make /dev/random be almost like /dev/urandom
e962a3ae7996 random: ignore GRND_RANDOM in getentropy(2)
82c1e117cabe random: add GRND_INSECURE to return best-effort non-cryptographic bytes
a7b2d8f6e6e3 random: Add a urandom_read_nowait() for random APIs that don't warn
ab956b5be99a random: Don't wake crng_init_wait when crng_init == 1
79dd56c9fe2b lib/crypto: sha1: re-roll loops to reduce code size
1815bfce3e21 lib/crypto: blake2s: move hmac construction into wireguard
38ec02a401b0 crypto: blake2s - generic C library implementation and selftest
365af44f3ea6 crypto: Deduplicate le32_to_cpu_array() and cpu_to_le32_array()
67108947e0bb Revert "hwrng: core - Freeze khwrng thread during suspend"
3209e130b81e char/random: Add a newline at the end of the file
9f00f56590b9 random: Use wait_event_freezable() in add_hwgenerator_randomness()
c288318b4c04 fdt: add support for rng-seed
982df0717c06 random: Support freezable kthreads in add_hwgenerator_randomness()
5ca70da062c5 random: fix soft lockup when trying to read from an uninitialized blocking pool
a4fb822be219 latent_entropy: avoid build error when plugin cflags are not set
d54abb49aef6 random: document get_random_int() family
166a592cad36 random: move rand_initialize() earlier
79246ba8065f random: only read from /dev/random after its pool has received 128 bits
78b1bfe3e42a drivers/char/random.c: make primary_crng static
db8aa1a25fca drivers/char/random.c: remove unused stuct poolinfo::poolbits
47811637e492 drivers/char/random.c: constify poolinfo_table
4bba4e8f42aa random: make CPU trust a boot parameter
9bb501015bcc random: Make crng state queryable
a5471125eea5 random: remove preempt disabled region
933dd2f9aa80 random: add a config option to trust the CPU's hwrng
c184f7c0013a random: Return nbytes filled from hw RNG
4b9c6116c295 random: Fix whitespace pre random-bytes work
7f0edf190598 drivers/char/random.c: remove unused dont_count_entropy
5f3167f94386 random: optimize add_interrupt_randomness
1e8f4f59a0b1 random: always fill buffer in get_random_bytes_wait
63c60b6a3e33 crypto: chacha20 - Fix keystream alignment for chacha20_block()
824d2a0f357b random: fix data race on crng_node_pool
86edede2cd02 random: always use batched entropy for get_random_u{32,64}
d118cad9f872 Revert "char/random: silence a lockdep splat with printk()"
e52d5836b7a7 char/random: silence a lockdep splat with printk()
876736acbe00 random: add a spinlock_t to struct batched_entropy
44ea43bef703 random: rate limit unseeded randomness warnings
32988e2d4ef3 random: fix possible sleeping allocation from irq context
13eec12cfa4f random: set up the NUMA crng instances after the CRNG is fully initialized
0467c15b092a random: use a different mixing algorithm for add_device_randomness()
103847375465 random: fix warning message on ia64 and parisc
2235bed1ee9a random: reorder READ_ONCE() in get_random_uXX
68b20d5c9710 random: suppress spammy warnings about unseeded randomness
8f7353468904 random: do not ignore early device randomness
04e5bfa62023 random: warn when kernel uses unseeded randomness
ca8f215ec54d random: add get_random_{bytes,u32,u64,int,long,once}_wait family
89548752d85e random: add wait_for_random_bytes() API
260fa1f3183a random: silence compiler warnings and fix race
67d998157041 random: invalidate batched entropy after crng init
9d037fdd5f86 random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block
7c8ed90ae33f random: convert get_random_int/long into get_random_u32/u64
d8abc2bdc5d6 random: fix comment for unused random_min_urandom_seed
84818eedf494 random: remove variable limit
e48be7ff82f5 random: remove stale urandom_init_wait
a86b868cc04e random: remove stale maybe_reseed_primary_crng
fe7cde423488 9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"

-----

Change-Id: Icc4c60bce1777275f74097a3d472d207380316f4
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>