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

Commit 432ea675 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



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

This includes the following changes:

91f70257 UPSTREAM: arm64: efi: Make efi_rt_lock a raw_spinlock
bdde16a5 Merge tag 'android11-5.4.254_r00' into android11-5.4
627da86f UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
9f659ee1 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
ca2edd4a UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
e749a1df UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
620d5b6b UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
b91825e0 BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I569d4fa756b3bebbd4e732c679003904a17e399d
parents 8a932792 91f70257

arch/arm64/include/asm/efi.h

+3 −3
Original line number Diff line number Diff line
@@ -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)

arch/arm64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;