Commit 04c98035 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.10' into branch 'android12-5.10-lts'



Catch up on a number of bugfixes and abi updates in the android12-5.10
branch.  This merge contains the following commits:

6af2483a BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
d43bb6d2 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
e6ddd6b6 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
e39ee80b UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
40439d12 UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
44ddc37b UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
ede2f9b7 ANDROID: abi_gki_aarch64_qcom: Add wait_for_device_probe symbol
db2f2cb8 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
cba41df4 UPSTREAM: netfilter: xt_u32: validate user space input
4865c22b UPSTREAM: net/sched: Retire rsvp classifier
f8424e65 UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
cd774431 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
6cd0cd38 UPSTREAM: netfilter: nf_tables: report use refcount overflow
99d2841c UPSTREAM: usb: gadget: ncm: Handle decoding of multiple NTB's in unwrap call
3cf93656 Merge tag 'android12-5.10.189_r00' into android12-5.10
78500417 ANDROID: ABI: Update oplus symbol list
d3961f62 ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton
180ea0f6 UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
6b6202b7 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
ff86e87c FROMGIT: f2fs: split initial and dynamic conditions for extent_cache
e22810eb ANDROID: GKI:  Update moto symbols list
3718ea1e ANDROID: vendor_hook: Add hook to skip swapcache
909a83a9 ANDROID: GKI: Update symbols to symbol list
6356ed35 ANDROID: add vendor hook of add/delete/iterate node for swap_avail_heads
bd34b887 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
7ba85ae1 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
9f68d297 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
88525fa7 ANDROID: GKI update xiaomi symbols list
1a6995cf UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
37d958fa UPSTREAM: USB: dwc3: fix use-after-free on core driver unbind
6388400b UPSTREAM: xhci: Fix incorrect tracking of free space on transfer rings
bc78acae UPSTREAM: kfence: avoid passing -g for test
b3bad922 UPSTREAM: coresight: etm4x: Do not access TRCIDR1 for identification
b155bf30 UPSTREAM: usb: typec: tcpm: fix warning when handle discover_identity message
72a7bbb4 UPSTREAM: f2fs: fix to update age extent in f2fs_do_zero_range()
1e1986dd UPSTREAM: f2fs: fix to update age extent correctly during truncation
3e9ba880 BACKPORT: f2fs: fix to do sanity check on extent cache correctly
e9542776 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
216e24b0 BACKPORT: f2fs: don't reset unchangable mount option in f2fs_remount()
a96eb7c2 ANDROID: arm64: dts: qcom: sdm845-db845c: Do not point MDSS to the boot splash memory region
ad067abf BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
00c7bec8 ANDROID: ABI: Update oplus symbol list  ashmem: is_ashmem_file Export is_ashmem_file function which will be used by the minidump module to get ashmem info.
300d1ff6 ANDROID: GKI: Update abi_gki_aarch64_qcom for page_owner symbols
a9c0f622 ANDROID: mm: Export page_owner_inited and __set_page_owner
d26e92d6 FROMGIT: pstore/ram: Check start of empty przs during init
966df87a UPSTREAM: exfat: check if filename entries exceeds max filename length
dcb17f36 BACKPORT: FROMGIT: netfilter: nfnetlink_log: always add a timestamp
a8b58500 FROMGIT: arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved
8001debf UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
8e682bb1 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
14ce45e3 ANDROID: ABI: Update oplus symbol list
98a66e87 ANDROID: Export symbols to do reverse mapping within memcg in kernel modules.
8af1bc56 ANDROID: GKI: export symbols to modify lru stats
b019a989 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
169c9f10 UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
819a8605 UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
f2545eeb BACKPORT: UPSTREAM: usb: dwc3: gadget: Execute gadget stop after halting the controller
6d38ae2f UPSTREAM: usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
6f01e099 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
0ebe7617 UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
45edbf40 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
e172f5cf ANDROID: GKI: update xiaomi symbol list
28b82089 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
bad8adda UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
84f85565 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
0fa8d8cd UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
6efa28db BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627
ec3f57af ANDROID: vendor_hook: fix the error record position of mutex
028e0fb3 FROMGIT: fs: drop_caches: draining pages before dropping caches
67f65c77 ANDROID: GKI: Update symbols to symbol list
8e164a95 ANDROID: GKI: Update symbols to symbol list
c4191be8 ANDROID: GKI: add symbol list file for moto
2427afff UPSTREAM: gfs2: Don't deref jdesc in evict
e933b7be UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()

Change-Id: I7b09cba3db8ae584fd0821bfbecf945e7d0bf9a4
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b4e242de 6af2483a
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment