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

Merge branch 'android12-5.4' into branch 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

1c84384f Merge tag 'android12-5.4.219_r00' into android12-5.4
df2b5549 UPSTREAM: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
1f568671 UPSTREAM: binder: Address corner cases in deferred copy and fixup
4b273c11 UPSTREAM: binder: fix pointer cast warning
b90f3eb2 UPSTREAM: binder: defer copies of pre-patched txn data
e875b871 UPSTREAM: binder: read pre-translated fds from sender buffer
473df966 UPSTREAM: binder: avoid potential data leakage when copying txn
b8d81d8b UPSTREAM: string: improve default out-of-line memcmp() implementation
c80a5b2e UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
e9f865cb FROMGIT: f2fs: allow to read node block after shutdown
f394d292 BACKPORT: f2fs: do not submit NEW_ADDR to read node block
5a34019e UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
a8b161b6 UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
5e295dcf UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
80bf73e7 ANDROID: ABI: Update symbols to unisoc whitelist
d87b38e6 UPSTREAM: random: restore O_NONBLOCK support
1f4c1217 UPSTREAM: wireguard: netlink: avoid variable-sized memcpy on sockaddr
e2be3234 UPSTREAM: wireguard: ratelimiter: disable timings test by default
4ecba903 UPSTREAM: pinctrl: sunxi: Fix name for A100 R_PIO
1be55fff BACKPORT: mmc: core: Fix UHS-I SD 1.8V workaround branch
deace6d5 UPSTREAM: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
969dc35d UPSTREAM: wireguard: allowedips: don't corrupt stack when detecting overflow
9dadfc2b UPSTREAM: wireguard: ratelimiter: use hrtimer in selftest
b58ee321 UPSTREAM: crypto: arm64/poly1305 - fix a read out-of-bound
f13df26e UPSTREAM: wifi: mac80211_hwsim: set virtio device ready in probe()
d29023fd BACKPORT: f2fs: don't use casefolded comparison for "." and ".."
d260f843 UPSTREAM: Revert "mm/cma.c: remove redundant cma_mutex lock"
15b402e9 UPSTREAM: dma-buf: call dma_buf_stats_setup after dmabuf is in valid list
f0e3a561 UPSTREAM: mm: hugetlb: add missing cache flushing in hugetlb_unshare_all_pmds()
c370d3bc UPSTREAM: wireguard: device: check for metadata_dst with skb_valid_dst()
e0c7af10 UPSTREAM: usb: dwc3: Try usb-role-switch first in dwc3_drd_init
92d66446 BACKPORT: usb: typec: ucsi: Fix reuse of completion structure
bea50c61 UPSTREAM: lkdtm/bugs: Check for the NULL pointer after calling kmalloc
b301ac00 UPSTREAM: irqchip/gic, gic-v3: Prevent GSI to SGI translations
e20cb70a UPSTREAM: proc: bootconfig: Add null pointer check
43029933 FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
f967523c UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
63b53ec1 UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
9242374b UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
20c2df21 UPSTREAM: wireguard: socket: ignore v6 endpoints when ipv6 is disabled
70321801 UPSTREAM: wireguard: socket: free skb in send6 when ipv6 is disabled
6729d698 UPSTREAM: wireguard: queueing: use CFI-safe ptr_ring cleanup function
aa798437 UPSTREAM: kunit: make kunit_test_timeout compatible with comment
8cebb276 BACKPORT: mm: madvise: skip unmapped vma holes passed to process_madvise
b155e285 UPSTREAM: mm: madvise: return correct bytes advised with process_madvise
91438eef BACKPORT: vsock: each transport cycles only on its own sockets
7aea2532 BACKPORT: tipc: fix incorrect order of state message data sanity check
97387e8f UPSTREAM: net: fix up skbs delta_truesize in UDP GRO frag_list
2b36d1bc BACKPORT: vsprintf: Fix %pK with kptr_restrict == 0
9960d1b5 UPSTREAM: cgroup-v1: Correct privileges check in release_agent writes
35ef444a UPSTREAM: mm: don't try to NUMA-migrate COW pages that have other uses
1a22c877 UPSTREAM: dma-buf: heaps: Fix potential spectre v1 gadget
602e0eea UPSTREAM: usb: raw-gadget: fix handling of dual-direction-capable endpoints
bea08d4e UPSTREAM: selinux: check return value of sel_make_avc_files
d5402222 UPSTREAM: dma-buf: cma_heap: Fix mutex locking section
92e88c8f UPSTREAM: scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl()
a0546dcd UPSTREAM: net: add and use skb_unclone_keeptruesize() helper
7634e8e7 UPSTREAM: bootconfig: init: Fix memblock leak in xbc_make_cmdline()
6df31a4f BACKPORT: memblock: introduce saner 'memblock_free_ptr()' interface
d0297622 UPSTREAM: dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER
3afaea28 BACKPORT: driver core: Fix error return code in really_probe()
80cb0010 UPSTREAM: fscrypt: fix derivation of SipHash keys on big endian CPUs
39fd7e51 UPSTREAM: mm/userfaultfd: fix memory corruption due to writeprotect
feae0c01 BACKPORT: userfaultfd: wp: add helper for writeprotect check
be0138c1 BACKPORT: Documentation: kunit: Update Kconfig parts for KUNIT's module support
066f3dba ANDROID: gki_defconfig: Remove implied config option CONFIG_BLK_DEV_INITRD
289bfb37 BACKPORT: bootconfig: Fix CONFIG_BOOTTIME_TRACING dependency issue
dd9d210a ANDROID: ABI: Update symbols to unisoc whitelist
e1b21340 FROMGIT: f2fs: let's avoid to get cp_rwsem twice by f2fs_evict_inode by d_invalidate
035e4939 ANDROID: Drop explicit 'CONFIG_INIT_STACK_ALL_ZERO=y' from gki_defconfig
998f1d84 UPSTREAM: hardening: Remove Clang's enable flag for -ftrivial-auto-var-init=zero
0af1bb67 UPSTREAM: hardening: Avoid harmless Clang option under CONFIG_INIT_STACK_ALL_ZERO
b05b82d7 UPSTREAM: hardening: Clarify Kconfig text for auto-var-init
66e358d3 UPSTREAM: wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
6ed9431a UPSTREAM: wifi: cfg80211/mac80211: reject bad MBSSID elements
a0a90f66 UPSTREAM: wifi: cfg80211: ensure length byte is present before access
9b4bf1b8 UPSTREAM: wifi: cfg80211: fix BSS refcounting bugs
c3a681ae UPSTREAM: wifi: cfg80211: avoid nontransmitted BSS list corruption
e26d7aad UPSTREAM: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
3c53f6f1 UPSTREAM: wifi: cfg80211: update hidden BSSes to avoid WARN_ON
9af40c65 UPSTREAM: mac80211: mlme: find auth challenge directly
00d900e6 UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response
0bb668cc UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free
8c70a830 BACKPORT: mmc: hsq: Fix data stomping during mmc recovery
ff63a5f5 ANDROID: Fix kenelci build-break for !CONFIG_PERF_EVENTS
6386afd7 ANDROID: ABI: Update symbols to unisoc whitelist
35e91026 BACKPORT: HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
a933e83f ANDROID: ABI: Update symbols to unisoc whitelist
cc4340df FROMGIT: f2fs: support recording stop_checkpoint reason into super_block
c9184019 ANDROID: ABI: Update symbols to unisoc whitelist
3ee2a371 ANDROID: firmware_loader: Replace use of strcpy and strncpy with strscpy
7c3ba9b0 ANDROID: firmware_loader: Fix warning with firmware_param_path_set
9653a402 ANDROID: firmware_loader: Add support for customer firmware paths

And add new symbols to the abi tracking:

Leaf changes summary: 4 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 3 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 1 Added variable

3 Added functions:

  [A] 'function int PageMovable(page*)'
  [A] 'function int nf_conntrack_register_notifier(net*, nf_ct_event_notifier*)'
  [A] 'function kuid_t sock_i_uid(sock*)'

1 Added variable:

  [A] 'kernel_cpustat kernel_cpustat'

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