Commit f87cbd05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull hardening updates from Kees Cook:
 "This addresses an -Warray-bounds warning found under a few ARM
  defconfigs, and disables long-broken HARDENED_USERCOPY_PAGESPAN"

* tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  ARM/dma-mapping: Remove CMA code when not built with CMA
  usercopy: Disable CONFIG_HARDENED_USERCOPY_PAGESPAN
parents 2975dbdc 229a08a4

arch/arm/mm/dma-mapping.c

+2 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ static int __init atomic_pool_init(void) 
 */

postcore_initcall(atomic_pool_init);



#ifdef CONFIG_CMA_AREAS

struct dma_contig_early_reserve {

	phys_addr_t base;

	unsigned long size;
@@ -435,6 +436,7 @@ void __init dma_contiguous_remap(void) 
		iotable_init(&map, 1);

	}

}

#endif



static int __dma_update_pte(pte_t *pte, unsigned long addr, void *data)

{

arch/arm/mm/mm.h

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ extern phys_addr_t arm_lowmem_limit; 


void __init bootmem_init(void);

void arm_mm_memblock_reserve(void);

#ifdef CONFIG_CMA_AREAS

void dma_contiguous_remap(void);

#else

static inline void dma_contiguous_remap(void) { }

#endif



unsigned long __clear_cr(unsigned long mask);

include/linux/cma.h

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
 */

#ifdef CONFIG_CMA_AREAS

#define MAX_CMA_AREAS	(1 + CONFIG_CMA_AREAS)



#else

#define MAX_CMA_AREAS	(0)



#endif



#define CMA_MAX_NAME 64

security/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ config HARDENED_USERCOPY 
config HARDENED_USERCOPY_PAGESPAN

	bool "Refuse to copy allocations that span multiple pages"

	depends on HARDENED_USERCOPY

	depends on EXPERT

	depends on BROKEN

	help

	  When a multi-page allocation is done without __GFP_COMP,

	  hardened usercopy will reject attempts to copy it. There are,