UPSTREAM: x86/pci: Fix the function type for check_reserved_t
e820__mapped_all() is passed as a callback to is_mmconf_reserved(), which expects a function of type: typedef bool (*check_reserved_t)(u64 start, u64 end, unsigned type); However, e820__mapped_all() accepts enum e820_type as the last argument and this type mismatch trips indirect call checking with Clang's Control-Flow Integrity (CFI). As is_mmconf_reserved() only passes enum e820_type values for the type argument, change the typedef and the unused type argument in is_acpi_reserved() to enum e820_type to fix the type mismatch. Bug: 210705746 (cherry picked from commit 83321c335dccba262a57378361d63da96b8166d6) Reported-by:Sedat Dilek <sedat.dilek@gmail.com> Suggested-by:
Borislav Petkov <bp@alien8.de> Signed-off-by:
Sami Tolvanen <samitolvanen@google.com> Signed-off-by:
Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20201130193900.456726-1-samitolvanen@google.com Change-Id: I92f78710ac55d5f567ad73053fc9f8c7cef68f71 (cherry picked from commit 7d1d5848183bd1d9086d0572f9af431d3ded407f) (cherry picked from commit 8f54ba9ae7e38e315df32f5338665a1e44cd1a4b)
Loading
Please register or sign in to comment