admin/chipsec-chipsec
1
0
Fork 0
mirror of https://github.com/chipsec/chipsec synced 2026-06-08 13:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

valid_mmap_phys_addr_range conflicts with upstream

Browse Source 
PaX implements valid_mmap_phys_addr_range in the kernel, and the
(return 1) hack in chipsec_km.c has a name collision with it.

Add another conditional for exposing the definition predicated on
whether __HAVE_ARCH_PAX_OPEN_USERLAND is defined in the kernel
headers. If it is, dont redefine the original function.
This commit is contained in:
RageLtMan
2019-10-28 23:52:43 -04:00
committed by BrentHoltsclaw
parent b77607a0e4
commit d02624bbaf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/linux/chipsec_km.c
+1 -1
View File
@@ -547,7 +547,7 @@ int __weak phys_mem_access_prot_allowed(struct file *file,
return 1;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,12) && defined(ARCH_HAS_VALID_PHYS_ADDR_RANGE)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,12) && defined(ARCH_HAS_VALID_PHYS_ADDR_RANGE) && !defined(__HAVE_ARCH_PAX_OPEN_USERLAND)
int valid_mmap_phys_addr_range(unsigned long pfn, size_t size)
{
return 1;