lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Sync up with the android11-5.4 branch to take some additional changes.

This includes the following changes:

91f702572a UPSTREAM: arm64: efi: Make efi_rt_lock a raw_spinlock
bdde16a5b9 Merge tag 'android11-5.4.254_r00' into android11-5.4
627da86f6d UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
9f659ee1e9 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
ca2edd4a03 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
e749a1dff6 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
620d5b6bd8 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
b91825e020 BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I569d4fa756b3bebbd4e732c679003904a17e399d
This commit is contained in:
Greg Kroah-Hartman 2023-10-12 09:15:52 +00:00
commit 432ea675f2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/include/asm/efi.h
View File

@ -25,7 +25,7 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
({ \
efi_virtmap_load(); \
__efi_fpsimd_begin(); \
spin_lock(&efi_rt_lock); \
raw_spin_lock(&efi_rt_lock); \
})
#define arch_efi_call_virt(p, f, args...) \
@ -37,12 +37,12 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);
#define arch_efi_call_virt_teardown() \
({ \
spin_unlock(&efi_rt_lock); \
raw_spin_unlock(&efi_rt_lock); \
__efi_fpsimd_end(); \
efi_virtmap_unload(); \
})
extern spinlock_t efi_rt_lock;
extern raw_spinlock_t efi_rt_lock;
efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...);
#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)

2
arch/arm64/kernel/efi.c
View File

@ -144,7 +144,7 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f)
return s;
}
DEFINE_SPINLOCK(efi_rt_lock);
DEFINE_RAW_SPINLOCK(efi_rt_lock);
asmlinkage u64 *efi_rt_stack_top __ro_after_init;