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

Merge branch 'android13-5.15' into branch 'android13-5.15-lts'



This catches the android13-5.15-lts branch up with a lot of recent
changes that have gone into the android13-5.15 branch, including new
symbols that need to be tracked properly.

Included in here are the following changes:

* eff6178f ANDROID: ABI: Update pixel symbol list
* c43b7972 Merge tag 'android13-5.15.137_r00' into android13-5.15
* d2d389f5 UPSTREAM: USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
* f4fd913e UPSTREAM: USB: core: Change usb_get_device_descriptor() API
* a0f42bab UPSTREAM: USB: core: Unite old scheme and new scheme descriptor reads
* 2550d09b UPSTREAM: drm/qxl: fix UAF on handle creation
* d6f794bc FROMGIT: usb:gadget:uvc Do not use worker thread to pump isoc usb requests
* 19914a12 FROMGIT: usb: gadget: uvc: Fix use-after-free for inflight usb_requests
* d1028058 FROMGIT: usb: gadget: uvc: move video disable logic to its own function
* 17f7b063 FROMGIT: usb: gadget: uvc: Allocate uvc_requests one at a time
* e7ed9e42 FROMGIT: usb: gadget: uvc: prevent use of disabled endpoint
* b2017f5a ANDROID: fuse-bpf: Add NULL pointer check in fuse_release_in
* 18865dbc FROMGIT: Input: uinput - allow injecting event times
* e039fcab ANDROID: ABI: Update oplus symbol list
* 0eb66ec3 ANDROID: vendor_hooks: Add hooks for binder
* 16963011 BACKPORT: dma-buf: add dma_fence_unwrap v2
* 67e5ffd3 UPSTREAM: dma-buf: Add dma_fence_array_for_each (v2)
* 20b2d562 UPSTREAM: dma-buf: add dma_fence_chain_contained helper
* a2a56bf8 BACKPORT: blk-ioprio: Introduce promote-to-rt policy
* a0c7043a BACKPORT: block: Always initialize bio IO priority on submit
* 739e44e7 BACKPORT: block: Initialize bio priority earlier
* b029b536 BACKPORT: blk-ioprio: Convert from rqos policy to direct call
* 0468dbfa ANDROID: KVM: arm64: Fix error path in pkvm_mem_abort()
* d8156345 ANDROID: GKI: Add symbol list for Transsion
* 690e148c ANDROID: GKI: Update symbol list for Amlogic
* cd7989c5 ANDROID: mm: add vendor hook in isolate_freepages()
* 6dcfedcb UPSTREAM: kthread: dynamically allocate memory to store kthread's full name
* e3eb2bbc BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
* 29ee4272 UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()
* 46b8053e UPSTREAM: vringh: don't use vringh_kiov_advance() in vringh_iov_xfer()
* e4cb5eaa FROMGIT: ufs: core: wlun send SSU timeout recovery
* f0033a7e ANDROID: abi_gki_aarch64_qcom: Update QCOM symbol list
* 85ccc4a2 ANDROID: ABI: Update symbols to unisoc whitelist
* c85178ce UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
* 373d8674 BACKPORT: usb: gadget: uvc: Add missing initialization of ssp config descriptor
* df15bb14 BACKPORT: usb: gadget: unconditionally allocate hs/ss descriptor in bind operation
* 85156cff UPSTREAM: usb: gadget: f_uvc: change endpoint allocation in uvc_function_bind()
* b153f0c5 UPSTREAM: usb: gadget: function: Remove unused declarations
* 0f24a9ed UPSTREAM: usb: gadget: uvc: clean up comments and styling in video_pump
* ff642845 UPSTREAM: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* a82ccd72 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 10277013 ANDROID: GKI: Update symbol list for Tuxera
* d0a5b5f6 ANDROID: GKI: Update symbol list for Amlogic
* d7644c89 ANDROID: mm: allow hooks into __alloc_pages()
* 50b7feda UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* e89b1266 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* f637dd4c UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* 72d0bfc6 UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 4d065e6a ANDROID: abi_gki_aarch64_qcom: Add wait_for_device_probe symbol
* ac178987 ANDROID: GKI: Update symbol list for Amlogic
* 488dcc05 BACKPORT: take care to handle NULL ->proc_lseek()
* d4c2ea3e ANDROID: GKI: Update symbol list for Amlogic
* dc8e07a5 ANDROID: vendor_hooks: add vendor hook in __alloc_pages()
* be34ad94 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* c7d73c91 BACKPORT: xhci: Keep interrupt disabled in initialization until host is running.
* 9ab4afca BACKPORT: f2fs: allocate node blocks for atomic write block replacement
* 48c18bb0 BACKPORT: f2fs: use cow inode data when updating atomic write
* 31376293 BACKPORT: f2fs: fix to check return value of inc_valid_block_count()
* 2dfe6648 BACKPORT: f2fs: fix to check return value of f2fs_do_truncate_blocks()
* f3f08c64 BACKPORT: f2fs: fix null pointer panic in tracepoint in __replace_atomic_write_block
* 1625f1a6 BACKPORT: f2fs: synchronize atomic write aborts
* 4f593369 BACKPORT: f2fs: fix to handle F2FS_IOC_START_ATOMIC_REPLACE in f2fs_compat_ioctl()
* 7ce5c702 BACKPORT: f2fs: fix to abort atomic write only during do_exist()
* 709e51ba BACKPORT: f2fs: clear atomic_write_task in f2fs_abort_atomic_write()
* 11cc01ee BACKPORT: f2fs: introduce trace_f2fs_replace_atomic_write_block
* c148d63e BACKPORT: f2fs: introduce F2FS_IOC_START_ATOMIC_REPLACE
* a9fafdc4 BACKPORT: f2fs: correct i_size change for atomic writes
* c964e0fb BACKPORT: f2fs: change to use atomic_t type form sbi.atomic_files
* 8074e8d1 BACKPORT: f2fs: clean up f2fs_abort_atomic_write()
* 407a7bfa BACKPORT: f2fs: fix null-ptr-deref in f2fs_get_dnode_of_data
* 5000638e BACKPORT: f2fs: revive F2FS_IOC_ABORT_VOLATILE_WRITE
* 97451746 BACKPORT: f2fs: introduce sysfs atomic write statistics
* 255af4c3 BACKPORT: f2fs: add a sysfs entry to show zone capacity
* e0923190 BACKPORT: f2fs: replace F2FS_I(inode) and sbi by the local variable
* 6f1a8b7d BACKPORT: f2fs: avoid unneeded error handling for revoke_entry_slab allocation
* a7ad8915 BACKPORT: f2fs: kill volatile write support
* 76ca4a07 BACKPORT: f2fs: change the current atomic write way
* 048853c5 UPSTREAM: netfilter: xt_u32: validate user space input
* 56255021 UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 5ccdde76 UPSTREAM: net/sched: Retire rsvp classifier
* e01c180a UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* bab11339 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
* 8a0ac15c FROMGIT: usb: typec: ucsi: Clear EVENT_PENDING bit if ucsi_send_command fails
* 05167f08 UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
* 082a5bf2 UPSTREAM: mmc:block:fix in_flight[issue_type] value error
* 87478bda Merge tag 'android13-5.15.123_r00' into android13-5.15
* 4655b13f UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* 3844902e UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* d34029c8 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
* 35fa3537 BACKPORT: mm: page_alloc: fix CMA and HIGHATOMIC landing on the wrong buddy list
* 3ac536f8 UPSTREAM: ARM: ptrace: Restore syscall skipping for tracers
* 3c5af9e0 UPSTREAM: ARM: ptrace: Restore syscall restart tracing
* c8443a21 ANDROID: ABI: Update oplus symbol list
* 09f3b244 ANDROID: vendor_hooks: Add hooks for oem percpu-rwsem optimaton
* 0007dae4 ANDROID: Update abi_gki_aarch64_qcom for usb typec orientation
* 5d6584e0 ANDROID: GKI: Update symbol list for Amlogic
* 46fbfc12 ANDROID: vendor_hooks: add vendor hook in xhci_urb_suitable_for_idt()
* ee2fd662 ANDROID: GKI: Update symbol list for mtk
* 60f97c64 ANDROID: tools/resolve_btfids: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* 8f75dab1 ANDROID: libsubcmd: Hoist iterator variable declarations in parse_options_subcommand()
* 9a8c25be ANDROID: enable CONFIG_USB_XHCI_PCI_RENESAS in gki_defconfig
* 74e3fb48 ANDROID: GKI: Update oplus symbol list
* d6c24c3a ANDROID: vendor_hooks: Add hooks for adjusting alloc_flags
* c1fa53f3 ANDROID: uid_sys_stat: instead update_io_stats_uid_locked to update_io_stats_uid
* c949fbdc ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table.
* f9a12303 ANDROID: GKI: Update symbol list for Amlogic
* 965abef6 BACKPORT: FROMLIST: ovl: get_acl: Fix null pointer dereference at realinode in rcu-walk mode
* 676f9ba1 BACKPORT: FROMLIST: ovl: ovl_permission: Fix null pointer dereference at realinode in rcu-walk mode
* 66c03b82 BACKPORT: FROMLIST: ovl: Let helper ovl_i_path_real() return the realinode
* c9f05404 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* 9798dc0c ANDROID: vendor_hooks: add missing forward declare for struct cma
* 734916f1 ANDROID: GKI: Add thermal genl vendor hook
* b4d31131 ANDROID: thermal: Add vendor thermal genl check
* c5757900 BACKPORT: printk: ringbuffer: Fix truncating buffer size min_t cast
* 154a18b2 ANDROID: ABI: Update symbols to unisoc whitelist
* dac9a9b1 UPSTREAM: block/mq-deadline: Set the fifo_time member also if inserting at head
* fcc30462 UPSTREAM: block/mq-deadline: Prioritize high-priority requests
* 8ecb51cd UPSTREAM: block/mq-deadline: Stop using per-CPU counters
* 2a8fbb97 UPSTREAM: block/mq-deadline: Add an invariant check
* b7deb974 UPSTREAM: block/mq-deadline: Improve request accounting further
* 92babd44 BACKPORT: mm/filemap.c: fix update prev_pos after one read request done
* 4097bc85 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* cc960d6c ANDROID: GKI: Update symbol list for Amlogic
* d1051298 ANDROID: vendor_hooks: add vendor hook in cma_alloc()
* 73528dcb ANDROID: GKI: Update symbol list for sunxi
* 1ee5e96a ANDROID: abi_gki_aarch64_qcom: Add blk_ksm_reprogram_all_keys symbol
* d4f95b54 BACKPORT: block/mq-deadline: use correct way to throttle write requests
* e71ded6c BACKPORT: mm: avoid unnecessary flush on change_huge_pmd()
* 49745e7a BACKPORT: mm/mprotect: do not flush when not required architecturally
* 8923a83d BACKPORT: mm/mprotect: use mmu_gather
* d73fc26d ANDROID: uid_sys_stats: Use llist for deferred work
* f37ba43f ANDROID: uid_sys_stats: Use a single work for deferred updates
* 622c1418 ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* a1f654ed ANDROID: fuse-bpf: Get correct inode in mkdir
* 15945636 ANDROID: GKI: prevent removal of monitored symbols
* 31c3f0ea BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
* 6b6ab2b9 UPSTREAM: netfilter: nf_tables: deactivate catchall elements in next generation
* 17f6f4f3 ANDROID: Fix unaligned memory access
* c4a8b3a5 ANDROID: GKI: Update symbol list for Amlogic
* f60d8b8d ANDROID: GKI: Introduce new ABI symbol list
* 462a6aa9 ANDROID: GKI: Update abi_gki_aarch64_qcom for page_owner symbols
* d403c302 ANDROID: mm: Export page_owner_inited and __set_page_owner
* 03248519 FROMGIT: pstore/ram: Check start of empty przs during init
* 4b2aadeb UPSTREAM: exfat: check if filename entries exceeds max filename length
* 55bd8a97 ANDROID: GKI: Update symbol list for Amlogic
* 6d71772c ANDROID: ABI: Update oplus symbol list
* 0e5b2901 ANDROID: vendor_hooks: Add hooks for waking up and exiting control
* ae0fb8d6 ANDROID: Hack to support ABI stable accept_ra_min_lft
* 7bd837ea BACKPORT: FROMGIT: netfilter: nfnetlink_log: always add a timestamp

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