Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05fe88d1 authored by Todd Kjos's avatar Todd Kjos Committed by Greg Kroah-Hartman
Browse files

Merge "Merge tag 'android11-5.4.242_r00' into android11-5.4" into android11-5.4-lts



Contains the following commits from android11-5.4:

*   304bc0bbaf21 Merge "Merge tag 'android11-5.4.242_r00' into android11-5.4" into android11-5.4-lts
|\
| * 3b9196f7 Merge tag 'android11-5.4.242_r00' into android11-5.4
* | 02293ac0 UPSTREAM: ext4: avoid a potential slab-out-of-bounds in ext4_group_desc_csum
* | 419a816b UPSTREAM: ext4: fix invalid free tracking in ext4_xattr_move_to_block()
|/
* 8177b9d9 Revert "Revert "mm/rmap: Fix anon_vma->degree ambiguity leading to double-reuse""
* 6d5e0c78 FROMLIST: binder: fix UAF caused by faulty buffer cleanup
* 0779e2b5 UPSTREAM: usb: musb: mediatek: don't unregister something that wasn't registered
* e3280136 UPSTREAM: net: fix NULL pointer in skb_segment_list
* 7fcf9449 UPSTREAM: xfrm/compat: prevent potential spectre v1 gadget in xfrm_xlate32_attr()
* 79f59b0d UPSTREAM: xfrm: compat: change expression for switch in xfrm_xlate64
* 35093f38 UPSTREAM: perf/core: Call LSM hook after copying perf_event_attr
* edbf3d0e UPSTREAM: ext4: fix use-after-free in ext4_xattr_set_entry
* ed2290e3 UPSTREAM: ext4: remove duplicate definition of ext4_xattr_ibody_inline_set()
* df0f6ba0 UPSTREAM: Revert "ext4: fix use-after-free in ext4_xattr_set_entry"
* 4716ccc3 UPSTREAM: media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
* ae46662a ANDROID: incremental fs: Evict inodes before freeing mount data
* 5da4c29d UPSTREAM: ext4: fix kernel BUG in 'ext4_write_inline_data_end()'
* 02a09d41 UPSTREAM: hid: bigben_probe(): validate report count
* 63c050ea UPSTREAM: HID: bigben: use spinlock to safely schedule workers
* ce095c74 BACKPORT: of: base: Skip CPU nodes with "fail"/"fail-..." status
* cdbef396 UPSTREAM: HID: bigben_worker() remove unneeded check on report_field
* dfeba42a UPSTREAM: HID: bigben: use spinlock to protect concurrent accesses
* 13e656b3 UPSTREAM: hwrng: virtio - add an internal buffer

Change-Id: Iaa4d5779bef81fd1afaab0fd1490752f04041a07
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 02293ac0 3b9196f7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment