Commit fc10db4b authored by Will McVicker's avatar Will McVicker
Browse files

Merge android13-5.10 into android13-5.10-lts



This includes running:
  BUILD_CONFIG=common/build.config.gki.aarch64 build/kernel/build_abi.sh --update

* aosp/android13-5.10:
  Reapply "perf: Fix perf_event_validate_size()"
  ANDROID: binder: fix integer as NULL assignment
  UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
  UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
  UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl
  Reapply "perf: Disallow mis-matched inherited group reads"
  ANDROID: ABI break fix caused by kernfs_root and kernfs_elem_dir size increase
  UPSTREAM: kernfs: fix NULL dereferencing in kernfs_remove
  UPSTREAM: kernfs: prevent early freeing of root node
  UPSTREAM: kernfs: switch global kernfs_rwsem lock to per-fs lock
  UPSTREAM: kernfs: don't create a negative dentry if inactive node exists
  UPSTREAM: kernfs: also call kernfs_set_rev() for positive dentry
  UPSTREAM: kernfs: dont call d_splice_alias() under kernfs node lock
  BACKPORT: kernfs: use i_lock to protect concurrent inode updates
  UPSTREAM: kernfs: switch kernfs to use an rwsem
  UPSTREAM: kernfs: use VFS negative dentry caching
  UPSTREAM: kernfs: add a revision to identify directory node changes
  BACKPORT: block, bfq: fix UAF problem in bfqg_stats_init()
  ANDROID: mm: Fix VMA ref count after fast-mremap
  UPSTREAM: usb: gadget: uvc: Remove nested locking
  UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
  ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
  FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields
  ANDROID: binder: fix KMI-break due to alloc->lock
  ANDROID: binder: fix KMI-break due to address type change
  BACKPORT: FROMGIT: binder: switch alloc->mutex to spinlock_t
  BACKPORT: FROMGIT: binder: reverse locking order in shrinker callback
  FROMGIT: binder: avoid user addresses in debug logs
  FROMGIT: binder: refactor binder_delete_free_buffer()
  FROMGIT: binder: collapse print_binder_buffer() into caller
  FROMGIT: binder: document the final page calculation
  BACKPORT: FROMGIT: binder: rename lru shrinker utilities
  UPSTREAM: drivers/android: remove redundant ret variable
  FROMGIT: binder: make oversized buffer code more readable
  FROMGIT: binder: remove redundant debug log
  BACKPORT: FROMGIT: binder: perform page installation outside of locks
  FROMGIT: binder: initialize lru pages in mmap callback
  FROMGIT: binder: malloc new_buffer outside of locks
  BACKPORT: FROMGIT: binder: refactor page range allocation
  BACKPORT: FROMGIT: binder: relocate binder_alloc_clear_buf()
  FROMGIT: binder: relocate low space calculation
  FROMGIT: binder: separate the no-space debugging logic
  FROMGIT: binder: remove pid param in binder_alloc_new_buf()
  FROMGIT: binder: do unlocked work in binder_alloc_new_buf()
  FROMGIT: binder: split up binder_update_page_range()
  FROMGIT: binder: keep vma addresses type as unsigned long
  FROMGIT: binder: remove extern from function prototypes
  FROMGIT: binder: fix comment on binder_alloc_new_buf() return value
  FROMGIT: binder: fix trivial typo of binder_free_buf_locked()
  FROMGIT: binder: fix unused alloc->free_async_space
  FROMGIT: binder: fix async space check for 0-sized buffers
  FROMGIT: binder: fix race between mmput() and do_exit()
  BACKPORT: FROMGIT: binder: fix use-after-free in shinker's callback
  FROMGIT: binder: use EPOLLERR from eventpoll.h
  UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
  UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
  UPSTREAM: trace: bpf: Allow bpf to attach to bare tracepoints
  BACKPORT: USB: gadget: core: adjust uevent timing on gadget unbind
  ANDROID: GKI: Enable CONFIG_USB_EHCI_ROOT_HUB_TT
  UPSTREAM: dm verity: don't perform FEC for failed readahead IO
  UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
  UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
  ANDROID: fuse-bpf: Follow mounts in lookups
  UPSTREAM: usb: dwc3: core: Host wake up support from system suspend
  UPSTREAM: dt-bindings: usb: dwc3: Add wakeup-source property support
  ANDROID: Snapshot Mainline's version of checkpatch.pl
  FROMLIST: binder: fix memory leaks of spam and pending work
  UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
  UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space
  UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space
  UPSTREAM: ALSA: pcm: fix out-of-bounds in snd_pcm_state_names
  ANDROID: Update the ABI symbol list
  ANDROID: GKI: add a vendor hook in ptep_clear_flush_young()
  ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
  ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
  ANDROID: fix up rpmsg_device ABI break
  ANDROID: fix up platform_device ABI break
  UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
  UPSTREAM: rpmsg: glink: Release driver_override
  BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
  BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
  UPSTREAM: rpmsg: Constify local variable in field store macro
  UPSTREAM: driver: platform: Add helper for safer setting of driver_override
  ANDROID: Update the ABI representation
  ANDROID: sched: Add trace_android_rvh_set_user_nice_locked

Test: Boot test on Pixel 7 without recompiling modules
Bug: 320714627
Change-Id: Ia9714e42500b02229bce42a8d71225a143e34242
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
parents 87a5e148 616fe21e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment