Michael Bestas
4f0c737494
Merge tag 'ASB-2023-08-05_4.14-stable' of https://android.googlesource.com/kernel/common into android-msm-pixel-4.14
https://source.android.com/docs/security/bulletin/2023-08-01
CVE-2023-21264
CVE-2020-29374
* tag 'ASB-2023-08-05_4.14-stable' of https://android.googlesource.com/kernel/common: (1241 commits)
UPSTREAM: xfrm: Check if_id in xfrm_migrate
Linux 4.14.320
i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle
x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys
drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl
drm/exynos: fix race condition UAF in exynos_g2d_exec_ioctl
drm/exynos: vidi: fix a wrong error return
s390/cio: unregister device when the only path is gone
usb: gadget: udc: fix NULL dereference in remove()
fbdev: imsttfb: Release framebuffer and dealloc cmap on error path
nfcsim.c: Fix error checking for debugfs_create_dir
arm64: Add missing Set/Way CMO encodings
HID: wacom: Add error check to wacom_parse_and_register()
scsi: target: iscsi: Prevent login threads from racing between each other
netfilter: nf_tables: disallow element updates of bound anonymous sets
be2net: Extend xmit workaround to BE3 chip
mmc: usdhi60rol0: fix deferred probing
mmc: omap_hsmmc: fix deferred probing
mmc: omap: fix deferred probing
mmc: mtk-sd: fix deferred probing
...
Conflicts:
drivers/edac/edac_device.c
drivers/mmc/core/block.c
drivers/mtd/ubi/wl.c
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
drivers/usb/core/hub.c
drivers/usb/core/quirks.c
drivers/usb/dwc3/core.c
drivers/usb/gadget/function/f_fs.c
fs/ext4/page-io.c
fs/incfs/main.c
fs/incfs/vfs.c
fs/verity/enable.c
include/drm/drm_mipi_dsi.h
include/net/pkt_sched.h
include/uapi/linux/virtio_ids.h
kernel/panic.c
mm/kasan/report.c
Change-Id: I8d87ff356c3d786b122e5addf42282830a6f3260