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

Skip to content
Commit d8295991 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into branch 'android11-5.4-lts'



This syncs up the back-merge of android11-5.4 into the -lts branch.
Included in here are the following commits:

* df80fcf8 Merge tag 'android11-5.4.281_r00' into android11-5.4
* ef9a17e6 UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()
* f4e5b515 FROMLIST: binder: fix UAF caused by offsets overwrite
* 7453ecf4 UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

Change-Id: I38e7c94c958b6b71725e5391b22bafda514796cf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a0347a4c df80fcf8
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