xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'android12-5.10' into android12-5.10-lts

Browse Source 
Sync up with android12-5.10 for the following commits:

7f74a5165a FROMLIST: scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()
06e12b3d0a Revert "ANDROID: ABI: initial update allowed list for galaxy"
66b6a4a736 Revert "ANDROID: ABI: update allowed list for galaxy"
f3f9d49629 Revert "ANDROID: ABI: Update allowed list for galaxy"
ef0c4c92e4 ANDROID: Use authoritative Dr. No list from android-mainline
8e6d28165f ANDROID: ABI: Update allowed list for galaxy

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic5d96493dce7f612807c97bb06a7a34dae47c54b
This commit is contained in:
Greg Kroah-Hartman
2021-07-23 14:33:05 +02:00
parent c0dd8de281 7f74a5165a
commit 90a010f605
4 changed files with 11 additions and 4387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OWNERS
View File

@@ -1,15 +1,12 @@
set noparent set noparent
# GKI Dr. No Enforcement is active on this branch. Approval of one of the # GKI Dr. No Enforcement is active on this branch. Approval of one of the Dr.
# following persons is required following a regular CodeReview+2 vote of a code # No reviewers is required following a regular CodeReview+2 vote of a code
# reviewer. # reviewer.
# #
# See the GKI release documentation (go/gki-dr-no) for further details. # See the GKI release documentation (go/gki-dr-no) for further details.
#
# The expanded list of reviewers can be found at:
# https://android.googlesource.com/kernel/common/+/android-mainline/OWNERS_DrNo
adelva@google.com include kernel/common:android-mainline:/OWNERS_DrNo
maennich@google.com
malchev@google.com
saravanak@google.com
smuckle@google.com
sspatil@google.com
tkjos@google.com

4374
android/abi_gki_aarch64_galaxy
View File

File diff suppressed because it is too large Load Diff

1
build.config.gki.aarch64
View File

@@ -15,7 +15,6 @@ android/abi_gki_aarch64_db845c
android/abi_gki_aarch64_qcom android/abi_gki_aarch64_qcom
android/abi_gki_aarch64_virtual_device android/abi_gki_aarch64_virtual_device
android/abi_gki_aarch64_hikey960 android/abi_gki_aarch64_hikey960
android/abi_gki_aarch64_galaxy
android/abi_gki_aarch64_generic android/abi_gki_aarch64_generic
android/abi_gki_aarch64_exynos android/abi_gki_aarch64_exynos
android/abi_gki_aarch64_exynosauto android/abi_gki_aarch64_exynosauto

8
drivers/scsi/ufs/ufshcd.c
View File

@@ -3393,9 +3393,11 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,
if (is_kmalloc) { if (is_kmalloc) {
/* Make sure we don't copy more data than available */ /* Make sure we don't copy more data than available */
if (param_offset + param_size > buff_len) if (param_offset >= buff_len)
param_size = buff_len - param_offset; ret = -EINVAL;
memcpy(param_read_buf, &desc_buf[param_offset], param_size); else
memcpy(param_read_buf, &desc_buf[param_offset],
min_t(u32, param_size, buff_len - param_offset));
} }
out: out:
if (is_kmalloc) if (is_kmalloc)