Tao Huang 1253eedfbf Merge tag 'ASB-2023-10-06_12-5.10' of https://android.googlesource.com/kernel/common ...

https://source.android.com/docs/security/bulletin/2023-10-01

* tag 'ASB-2023-10-06_12-5.10': (4345 commits)
  ANDROID: ABI: Update oplus symbol list
  ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton
  UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
  UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
  FROMGIT: f2fs: split initial and dynamic conditions for extent_cache
  ANDROID: GKI:  Update moto symbols list
  ANDROID: vendor_hook: Add hook to skip swapcache
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: add vendor hook of add/delete/iterate node for swap_avail_heads
  UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
  UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
  UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
  ANDROID: GKI update xiaomi symbols list
  UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
  UPSTREAM: USB: dwc3: fix use-after-free on core driver unbind
  UPSTREAM: xhci: Fix incorrect tracking of free space on transfer rings
  UPSTREAM: kfence: avoid passing -g for test
  UPSTREAM: coresight: etm4x: Do not access TRCIDR1 for identification
  UPSTREAM: usb: typec: tcpm: fix warning when handle discover_identity message
  UPSTREAM: f2fs: fix to update age extent in f2fs_do_zero_range()
  ...

Change-Id: I629b30e89c59280f9fd1073d160b74de1d8b04b1

Conflicts:
	arch/arm/boot/dts/rk3288.dtsi
	drivers/crypto/Kconfig
	drivers/dma/pl330.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/pci/controller/pcie-rockchip.c
	drivers/phy/rockchip/phy-rockchip-inno-usb2.c
	drivers/phy/rockchip/phy-rockchip-typec.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/tty/serial/8250/8250_dma.c
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/dwc2/platform.c
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/gadget/udc/core.c
	drivers/usb/host/xhci.h
	drivers/usb/storage/unusual_uas.h
	drivers/usb/typec/altmodes/displayport.c
	drivers/usb/typec/tcpm/tcpm.c
	kernel/sched/fair.c
	sound/soc/rockchip/rockchip_pdm.c

2023-11-07 19:01:23 +08:00

60 KiB

Raw Permalink Blame History

View Raw