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

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



This catches the android12-5.4-lts branch up with the back-merge and
some other smaller changes that have happened in the android12-5.4
branch recently.  Included in here are the following commits:

* d883a228 UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()
* 61cc7d41 Merge tag 'android12-5.4.281_r00' into android12-5.4
* 135a19cf FROMLIST: binder: fix UAF caused by offsets overwrite
* 8edc449e ANDROID: GKI: update symbols to telechips symbol list
* f076c16c UPSTREAM: usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()

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