Commit e3fb13b7 authored Aug 23, 2019 by Linus Torvalds

linux

Pull modules fixes from Jessica Yu:
 "Fix BUG_ON() being triggered in frob_text() due to non-page-aligned
  module sections"

* tag 'modules-for-v5.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
  modules: page-align module section allocations only for arches supporting strict module rwx
  modules: always page-align module section allocations

parents 4e563944 3b5be16c

kernel/module.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,9 +65,9 @@
		/*
		* Modules' sections will be aligned on page boundaries
		* to ensure complete separation of code and data, but
		* only when CONFIG_STRICT_MODULE_RWX=y
		* only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
		*/
		#ifdef CONFIG_STRICT_MODULE_RWX
		#ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX
		# define debug_align(X) ALIGN(X, PAGE_SIZE)
		#else
		# define debug_align(X) (X)

Admin message