provide check for ro_after_init memory sections
Subsystems (3)
v4 cover provide check for ro_after_init memory sections
Provide a mechanism for other functions to verify that their arguments are read-only.
This implements the first half of a suggestion made by Kees Cook for the Kernel Self Protection Project:
- provide mechanism to check for ro_after_init memory areas, and reject structures not marked ro_after_init in vmbus_register()
http://www.openwall.com/lists/kernel-hardening/2017/02/04/1
The idea is to prevent structures (including modules) that are not read-only from being passed to functions. It builds upon the functions in kernel/extable.c that test if an address is in the text section.
I have dropped the third patch that uses these features to check the arguments to vmbus_register() because the maintainers have not been receptive to using it. My goal right now is to get the API right.
I have test compiled this series on next-20170324 for x86.
Eddie Kovsky (2):
module: verify address is read-only
extable: verify address is read-only
include/linux/kernel.h | 2 ++ include/linux/module.h | 12 ++++++++++++ kernel/extable.c | 29 +++++++++++++++++++++++++++ kernel/module.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+)
Signature · 1 line
2.12.1
PATCH v4 1/2 module: verify address is read-only
Implement a mechanism to check if a module's address is in the rodata or ro_after_init sections. It mimics the existing functions that test if an address is inside a module's text section.
Functions that take a module as an argument will be able to verify that the module address is in a read-only section. The idea is to prevent structures (including modules) that are not read-only from being passed to functions.
This implements the first half of a suggestion made by Kees Cook for the Kernel Self Protection Project:
- provide mechanism to check for ro_after_init memory areas, and reject structures not marked ro_after_init in vmbus_register()
---
Changes in v4:
- Rename function __module_ro_address() to __module_rodata_address()
- Move module_rodata_address() stub below is_module_address()
- Minor comment fixes
- Verify that mod is not NULL before setting up layout variables
Changes in v3:
- Change function name is_module_ro_address() tois_module_rodata_address().
- Improve comments on is_module_rodata_address().
- Add a !CONFIG_MODULES stub for is_module_rodata_address.
- Correct and simplify the check for the read-only memory regions in
the module address.
--- include/linux/module.h | 12 ++++++++++++ kernel/module.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+)
include/linux/module.h +12 -0
@@ -492,7 +492,9 @@ static inline int module_is_live(struct module *mod)struct module *__module_text_address (unsigned long addr);struct module *__module_address (unsigned long addr); +struct module *__module_rodata_address (unsigned long addr);bool is_module_address (unsigned long addr); +bool is_module_rodata_address (unsigned long addr);bool __is_module_percpu_address (unsigned long addr,unsigned long *can_addr);bool is_module_percpu_address (unsigned long addr);bool is_module_text_address (unsigned long addr);
@@ -646,6 +648,11 @@ static inline struct module *__module_address(unsigned long addr)return NULL ; } +static inline struct module *__module_rodata_address (unsigned long addr) +{ +return NULL ; +} +static inline struct module *__module_text_address (unsigned long addr) {return NULL ;
@@ -656,6 +663,11 @@ static inline bool is_module_address(unsigned long addr)return false; } +static inline bool is_module_rodata_address (unsigned long addr) +{ +return false; +} +static inline bool is_module_percpu_address (unsigned long addr) {return false;
kernel/module.c +53 -0
59 lines not on this page · raw message
Signature · 1 line
2.12.1
Re: [PATCH v4 1/2] module: verify address is read-only
+++ Eddie Kovsky [26/03/17 15:08 -0600]:
Quoted 8 lines
Implement a mechanism to check if a module's address is in the rodata or
ro_after_initsections. It mimics the existing functions that test if an address is inside a module's text section.Functions that take a module as an argument will be able to verify that the module address is in a read-only section. The idea is to prevent structures (including modules) that are not read-only from being passed to functions.
Quoted 8 lines
This implements the first half of a suggestion made by Kees Cook for the Kernel Self Protection Project:
- provide mechanism to check for
ro_after_initmemory areas, and reject structures not markedro_after_initinvmbus_register()Suggested-by Kees Cook <[email protected]>Signed-off-by Eddie Kovsky <[email protected]>
Thanks for the respin, this looks much better.
Quoted 123 lines
---
Changes in v4:
- Rename function__module_ro_address()to__module_rodata_address()
- Movemodule_rodata_address()stub belowis_module_address()
- Minor comment fixes
- Verify that mod is not NULL before setting up layout variables Changes in v3:
- Change function nameis_module_ro_address()tois_module_rodata_address().
- Improve comments onis_module_rodata_address().
- Add a !CONFIG_MODULES stub foris_module_rodata_address.
- Correct and simplify the check for the read-only memory regions in the module address.
---include/linux/module.h| 12 ++++++++++++kernel/module.c| 53 ++++++++++++++++++++++++++++++++++++++++++++++++++2 files changed, 65 insertions(+)include/linux/module.h +12
-0@@ -492,7 +492,9 @@ static inline int module_is_live(struct module *mod)struct module *__module_text_address (unsigned long addr);struct module *__module_address (unsigned long addr); +struct module *__module_rodata_address (unsigned long addr);bool is_module_address (unsigned long addr); +bool is_module_rodata_address (unsigned long addr);bool __is_module_percpu_address (unsigned long addr,unsigned long *can_addr);bool is_module_percpu_address (unsigned long addr);bool is_module_text_address (unsigned long addr);@@ -646,6 +648,11 @@ static inline struct module *__module_address(unsigned long addr)return NULL ; } +static inline struct module *__module_rodata_address (unsigned long addr) +{ +return NULL ; +} +static inline struct module *__module_text_address (unsigned long addr) {return NULL ;@@ -656,6 +663,11 @@ static inline bool is_module_address(unsigned long addr)return false; } +static inline bool is_module_rodata_address (unsigned long addr) +{ +return false; +} +static inline bool is_module_percpu_address (unsigned long addr) {return false;kernel/module.c +53
-0@@ -4292,6 +4292,59 @@ struct module *__module_text_address(unsigned long addr) }EXPORT_SYMBOL_GPL (__module_text_address); +/** +* is_module_rodata_address - is this address inside read-only module data? +* @addr: the address to check. +* +*/ +bool is_module_rodata_address (unsigned long addr) +{ +bool ret; + +preempt_disable (); + ret =__module_rodata_address (addr) !=NULL ; +preempt_enable (); + +return ret; +} + +/* +* __module_rodata_address - get the module whose rodata/ro_after_init sections +* contain the given address. +* @addr: the address. +* +* Must be called with preempt disabled or module mutex held so that +* module doesn't get freed during this. +*/ +struct module *__module_rodata_address (unsigned long addr) +{ +struct module *mod =__module_address (addr); + +/* +* Make sure module is within the read-only section. +* range(base + text_size, base + ro_after_init_size) +* encompasses both the rodata and ro_after_init regions. +* See comment above frob_text() for the layout diagram. +*/ +if (mod) { +void *init_base = mod->init_layout.base; +unsigned int init_text_size = mod->init_layout.text_size; +unsigned int init_ro_after_init_size = mod->init_layout.ro_after_init_size; + +void *core_base = mod->core_layout.base; +unsigned int core_text_size = mod->core_layout.text_size; +unsigned int core_ro_after_init_size = mod->core_layout.ro_after_init_size; + +if (!within (addr, init_base + init_text_size, + init_ro_after_init_size - init_text_size) + && !within (addr, core_base + core_text_size, + core_ro_after_init_size - core_text_size)) + mod =NULL ; + } +return mod; +} +EXPORT_SYMBOL_GPL (__module_rodata_address); +/* Don't grab lock, we're oopsing. */ void print_modules (void ) {Signature · 1 line
2.12.1
PATCH v4 2/2 extable: verify address is read-only
In reply to Eddie KovskyProvide a mechanism to check if the address of a variable is const or ro_after_init. It mimics the existing functions that test if an address is inside the kernel's text section.
The idea is to prevent structures that are not read-only from being passed to functions. Other functions inside the kernel could then use this capability to verify that their arguments are read-only.
This implements the first half of a suggestion made by Kees Cook for the Kernel Self Protection Project:
- provide mechanism to check for ro_after_init memory areas, and reject structures not marked ro_after_init in vmbus_register()
---
Changes in v4:
- Rename function core_kernel_ro_data() to core_kernel_rodata().
Changes in v3:
- Fix missing declaration of is_module_rodata_address()
--- include/linux/kernel.h | 2 ++ kernel/extable.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
include/linux/kernel.h +2 -0
@@ -444,6 +444,8 @@ extern int core_kernel_data(unsigned long addr);extern int __kernel_text_address (unsigned long addr);extern int kernel_text_address (unsigned long addr);extern int func_ptr_is_kernel_text (void *ptr); +extern int core_kernel_rodata (unsigned long addr); +extern int kernel_ro_address (unsigned long addr);unsigned long int_sqrt (unsigned long );
kernel/extable.c +29 -0
@@ -154,3 +154,32 @@ int func_ptr_is_kernel_text(void *ptr)return 1 ;return is_module_text_address (addr); } + +/** +* core_kernel_rodata - Verify address points to read-only section +* @addr: address to test +* +*/ +int core_kernel_rodata (unsigned long addr) +{ +if (addr >= (unsigned long )__start_rodata && + addr < (unsigned long )__end_rodata) +return 1 ; + +if (addr >= (unsigned long )__start_data_ro_after_init && + addr < (unsigned long )__end_data_ro_after_init) +return 1 ; + +return 0 ; +} + +/* Verify that address is const or ro_after_init. */ +int kernel_ro_address (unsigned long addr) +{ +if (core_kernel_rodata (addr)) +return 1 ; +if (is_module_rodata_address (addr)) +return 1 ; + +return 0 ; +}
Signature · 1 line
2.12.1
kbuild test robot
build botRe: [PATCH v4 2/2] extable: verify address is read-only
url: https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922 config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config) compiler…
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=blackfin
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':
>> kernel/extable.c:169: undefined reference to `__start_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__start_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__end_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__end_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__start_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__start_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__end_data_ro_after_init' >> kernel/extable.c:169: undefined reference to `__end_data_ro_after_init'
vim +169 kernel/extable.c
163 int core_kernel_rodata(unsigned long addr)
164 {
165 if (addr >= (unsigned long)__start_rodata &&
166 addr < (unsigned long)__end_rodata)
167 return 1;
168
> 169 if (addr >= (unsigned long)__start_data_ro_after_init &&
170 addr < (unsigned long)__end_data_ro_after_init)
171 return 1;
172
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH v4 2/2] extable: verify address is read-only
Quoted 15 lines · kbuild test robot
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=blackfin
Quoted 11 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 8 lines
Quoted 8 lines
kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'
Hm, I'm confused about this. blackfin includes include/asm-generic-vmlinux.lds.h and uses the RO_DATA macro (which resolves to RO_DATA_SECTION to RO_AFTER_INIT_DATA which defines __[start|end]_data_ro_after_init.
Also, it seems that commit d7c19b066dcf4bd19c4385e8065558d4e74f9e73 ("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:
arch/s390/kernel/vmlinux.lds.S +2 -0
@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;
And it seems that this hunk is wrong (__end_ro_after_init includes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.
I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Quoted 17 lines
vim +169
kernel/extable.c163 int core_kernel_rodata(unsigned long addr) 164 { 165 if (addr >= (unsigned long)__start_rodata && 166 addr < (unsigned long)__end_rodata) 167 return 1; 168Quoted 1 line
169 if (addr >= (unsigned long)__start_data_ro_after_init &&
170 addr < (unsigned long)__end_data_ro_after_init)
171 return 1; 172---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH v4 2/2] extable: verify address is read-only
Quoted 56 lines · Kees Cook
Quoted 15 lines · kbuild test robot
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=blackfinQuoted 11 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 8 lines
Quoted 8 lines
kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'Hm, I'm confused about this. blackfin includes
include/asm-generic-vmlinux.lds.hand uses theRO_DATAmacro (which resolves toRO_DATA_SECTIONtoRO_AFTER_INIT_DATAwhich defines __[start|end]_data_ro_after_init.Also, it seems that commit
d7c19b066dcf4bd19c4385e8065558d4e74f9e73("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:arch/s390/kernel/vmlinux.lds.S +2
-0@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;
Quoted 8 lines
And it seems that this hunk is wrong (
__end_ro_after_initincludes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Kees
I applied your patch (mm: fix section name for .data..ro_after_init) and changed the new function in extable.c to use __[start|end]_ro_after_init instead. The new version still builds without errors on x86, which isn't surprising.
I've cross compiled this for blackfin and I'm able to reproduce the build error. I'm still not sure why. As you pointed out, blackfin does appear to use 'include/asm-generic/vmlinux.lds.h'.
Eddie
Quoted 23 lines
Quoted 17 lines
vim +169
kernel/extable.c163 int core_kernel_rodata(unsigned long addr) 164 { 165 if (addr >= (unsigned long)__start_rodata && 166 addr < (unsigned long)__end_rodata) 167 return 1; 168Quoted 1 line
169 if (addr >= (unsigned long)__start_data_ro_after_init &&
170 addr < (unsigned long)__end_data_ro_after_init)
171 return 1; 172---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel CorporationSignature · 2 lines
Kees Cook Pixel Security
Re: [PATCH v4 2/2] extable: verify address is read-only
+++ Eddie Kovsky [28/03/17 21:28 -0600]:
Quoted 68 lines · Kees Cook
Quoted 56 lines · kbuild test robot
Quoted 15 lines
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=blackfinQuoted 11 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 8 lines
Quoted 8 lines
kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'kernel/extable.c:169: undefined reference to__start_data_ro_after_init' kernel/extable.c:169: undefined reference to__start_data_ro_after_init'kernel/extable.c:169: undefined reference to__end_data_ro_after_init' kernel/extable.c:169: undefined reference to__end_data_ro_after_init'Hm, I'm confused about this. blackfin includes
include/asm-generic-vmlinux.lds.hand uses theRO_DATAmacro (which resolves toRO_DATA_SECTIONtoRO_AFTER_INIT_DATAwhich defines __[start|end]_data_ro_after_init.Also, it seems that commit
d7c19b066dcf4bd19c4385e8065558d4e74f9e73("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:arch/s390/kernel/vmlinux.lds.S +2
-0@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;Quoted 8 lines
And it seems that this hunk is wrong (
__end_ro_after_initincludes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Kees
Quoted 8 lines
I applied your patch (mm: fix section name for .data..ro_after_init) and changed the new function in
extable.cto use __[start|end]_ro_after_init instead. The new version still builds without errors on x86, which isn't surprising.I've cross compiled this for blackfin and I'm able to reproduce the build error. I'm still not sure why. As you pointed out, blackfin does appear to use '
include/asm-generic/vmlinux.lds.h'.
This appears to be because blackfin is one of the 2 arches that prepends an underscore '_' to all symbols defined in C. I noticed that __{start,end}_data_ro_after_init in vmlinux.lds.h are not wrapped with VMLINUX_SYMBOL() which adds the necessary prefix for arches that have HAVE_UNDERSCORE_SYMBOL_PREFIX, hence the undefined reference.
The below patch fixed the build error for me, if it works for you then I can send a formal patch.
include/asm-generic/vmlinux.lds.h +0 -0
@@ -260,9 +260,9 @@*/
#ifndef RO_AFTER_INIT_DATA
#define RO_AFTER_INIT_DATA \
- __start_data_ro_after_init = .; \
+ VMLINUX_SYMBOL(__start_data_ro_after_init) = .; \ *(.data..ro_after_init) \
- __end_data_ro_after_init = .;
+ VMLINUX_SYMBOL(__end_data_ro_after_init) = .;
#endif
/*
Jessica
Re: [PATCH v4 2/2] extable: verify address is read-only
Quoted 96 lines · Jessica Yu
+++ Eddie Kovsky [28/03/17 21:28 -0600]:
Quoted 84 lines · Kees Cook
Quoted 71 lines · kbuild test robot
Quoted 20 lines
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url:
https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget
https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree make.cross ARCH=blackfinQuoted 19 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 16 lines
Quoted 16 lines
kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'Hm, I'm confused about this. blackfin includes
include/asm-generic-vmlinux.lds.hand uses theRO_DATAmacro (which resolves toRO_DATA_SECTIONtoRO_AFTER_INIT_DATAwhich defines __[start|end]_data_ro_after_init.Also, it seems that commit
d7c19b066dcf4bd19c4385e8065558d4e74f9e73("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:arch/s390/kernel/vmlinux.lds.S +2
-0@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;Quoted 9 lines
And it seems that this hunk is wrong (
__end_ro_after_initincludes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Kees
Quoted 8 lines
I applied your patch (mm: fix section name for .data..ro_after_init) and changed the new function in
extable.cto use __[start|end]_ro_after_init instead. The new version still builds without errors on x86, which isn't surprising.I've cross compiled this for blackfin and I'm able to reproduce the build error. I'm still not sure why. As you pointed out, blackfin does appear to use '
include/asm-generic/vmlinux.lds.h'.
Quoted 5 lines
This appears to be because blackfin is one of the 2 arches that prepends an underscore '_' to all symbols defined in C. I noticed that __{start,end}_data_ro_after_init in
vmlinux.lds.hare not wrapped withVMLINUX_SYMBOL()which adds the necessary prefix for arches that haveHAVE_UNDERSCORE_SYMBOL_PREFIX, hence the undefined reference.
Argh. Thank you for catching this! Yeah, that would have taken me forever to find.
Quoted 9 lines
The below patch fixed the build error for me, if it works for you then I can send a formal patch.
include/asm-generic/vmlinux.lds.h +0
-0
include/asm-generic/vmlinux.lds.h line 266
Quoted 9 lines
include/asm-generic/vmlinux.lds.h +2
-2@@ -260,9 +260,9 @@*/ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ - __start_data_ro_after_init = .; \ + VMLINUX_SYMBOL(__start_data_ro_after_init) = .; \ *(.data..ro_after_init) \ - __end_data_ro_after_init = .; + VMLINUX_SYMBOL(__end_data_ro_after_init) = .;#endif
I don't have a blackfin cross-compiler set up, but I'm sure that'll fix it. If you can, please base it on -next, since I rename __[start|end]_data_ro_after_init to __[start|end]_ro_after_init (to match the existing s390 symbols of the same purpose):
https://lkml.org/lkml/2017/3/27/685
akpm is carrying that patch, so this follow-up should likely go to him too.
Thanks!
-Kees
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH v4 2/2] extable: verify address is read-only
Quoted 130 lines · Kees Cook
Quoted 96 lines · Jessica Yu
+++ Eddie Kovsky [28/03/17 21:28 -0600]:
Quoted 84 lines · Kees Cook
Quoted 71 lines · kbuild test robot
Quoted 20 lines
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url:
https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget
https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree make.cross ARCH=blackfinQuoted 19 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 16 lines
Quoted 16 lines
kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'Hm, I'm confused about this. blackfin includes
include/asm-generic-vmlinux.lds.hand uses theRO_DATAmacro (which resolves toRO_DATA_SECTIONtoRO_AFTER_INIT_DATAwhich defines __[start|end]_data_ro_after_init.Also, it seems that commit
d7c19b066dcf4bd19c4385e8065558d4e74f9e73("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:arch/s390/kernel/vmlinux.lds.S +2
-0@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;Quoted 9 lines
And it seems that this hunk is wrong (
__end_ro_after_initincludes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Kees
Quoted 8 lines
I applied your patch (mm: fix section name for .data..ro_after_init) and changed the new function in
extable.cto use __[start|end]_ro_after_init instead. The new version still builds without errors on x86, which isn't surprising.I've cross compiled this for blackfin and I'm able to reproduce the build error. I'm still not sure why. As you pointed out, blackfin does appear to use '
include/asm-generic/vmlinux.lds.h'.Quoted 5 lines
This appears to be because blackfin is one of the 2 arches that prepends an underscore '_' to all symbols defined in C. I noticed that __{start,end}_data_ro_after_init in
vmlinux.lds.hare not wrapped withVMLINUX_SYMBOL()which adds the necessary prefix for arches that haveHAVE_UNDERSCORE_SYMBOL_PREFIX, hence the undefined reference.Argh. Thank you for catching this! Yeah, that would have taken me forever to find.
Quoted 9 lines
The below patch fixed the build error for me, if it works for you then I can send a formal patch.
include/asm-generic/vmlinux.lds.h +0
-0include/asm-generic/vmlinux.lds.h line 266
Quoted 9 lines
include/asm-generic/vmlinux.lds.h +2
-2@@ -260,9 +260,9 @@*/ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ - __start_data_ro_after_init = .; \ + VMLINUX_SYMBOL(__start_data_ro_after_init) = .; \ *(.data..ro_after_init) \ - __end_data_ro_after_init = .; + VMLINUX_SYMBOL(__end_data_ro_after_init) = .;#endif I don't have a blackfin cross-compiler set up, but I'm sure that'll fix it. If you can, please base it on -next, since I rename __[start|end]_data_ro_after_init to __[start|end]_ro_after_init (to match the existing s390 symbols of the same purpose):
Quoted 2 lines
I applied Jessica's patch and tested this again with a blackfin cross-compiler. It fixes the error building extable.c.
Quoted 9 lines
akpm is carrying that patch, so this follow-up should likely go to him too.
Thanks!
-Kees
Signature · 2 lines
Kees Cook Pixel Security
Re: [PATCH v4 2/2] extable: verify address is read-only
In reply to Jessica YuQuoted 123 lines · Jessica Yu
+++ Eddie Kovsky [28/03/17 21:28 -0600]:
Quoted 84 lines · Kees Cook
Quoted 71 lines · kbuild test robot
Quoted 20 lines
Hi Eddie,
[auto build test ERROR on next-20170323]
[cannot apply to linus/master linux/master jeyu/modules-next v4.9-rc8 v4.9-rc7 v4.9-rc6 v4.11-rc4]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url:
https://github.com/0day-ci/linux/commits/Eddie-Kovsky/module-verify-address-is-read-only/20170327-142922
config: blackfin-BF561-EZKIT-SMP_defconfig (attached as .config)
compiler: bfin-uclinux-gcc (GCC) 6.2.0
reproduce:
wget
https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree make.cross ARCH=blackfinQuoted 19 lines
All errors (new ones prefixed by >>):
kernel/built-in.o: In function `core_kernel_rodata':Quoted 16 lines
Quoted 16 lines
kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__start_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'kernel/extable.c:169: undefined reference to
`__end_data_ro_after_init'Hm, I'm confused about this. blackfin includes
include/asm-generic-vmlinux.lds.hand uses theRO_DATAmacro (which resolves toRO_DATA_SECTIONtoRO_AFTER_INIT_DATAwhich defines __[start|end]_data_ro_after_init.Also, it seems that commit
d7c19b066dcf4bd19c4385e8065558d4e74f9e73("mm: kmemleak: scan .data.ro_after_init") added a potentially redundant section name (s390 already calls this __[start|end]_ro_after_init). I'd like to get this cleaned up, since having multiple names for the same thing is confusing:arch/s390/kernel/vmlinux.lds.S +2
-0@@ -62,9 +62,11 @@ SECTIONS . = ALIGN(PAGE_SIZE); __start_ro_after_init = .; + __start_data_ro_after_init = .; .data..ro_after_init : { *(.data..ro_after_init) } + __end_data_ro_after_init = .; EXCEPTION_TABLE(16) . = ALIGN(PAGE_SIZE); __end_ro_after_init = .;Quoted 9 lines
And it seems that this hunk is wrong (
__end_ro_after_initincludes s390's exception table, etc). I think we should remove the ..._data_... name and use s390's name.I'll send an adjustment patch, but we'll still need to deal with blackfin.
-Kees
Kees
Quoted 8 lines
I applied your patch (mm: fix section name for .data..ro_after_init) and changed the new function in
extable.cto use __[start|end]_ro_after_init instead. The new version still builds without errors on x86, which isn't surprising.I've cross compiled this for blackfin and I'm able to reproduce the build error. I'm still not sure why. As you pointed out, blackfin does appear to use '
include/asm-generic/vmlinux.lds.h'.This appears to be because blackfin is one of the 2 arches that prepends an underscore '_' to all symbols defined in C. I noticed that __{start,end}_data_ro_after_init in
vmlinux.lds.hare not wrapped withVMLINUX_SYMBOL()which adds the necessary prefix for arches that haveHAVE_UNDERSCORE_SYMBOL_PREFIX, hence the undefined reference.The below patch fixed the build error for me, if it works for you then I can send a formal patch.
include/asm-generic/vmlinux.lds.h +2
-2@@ -260,9 +260,9 @@*/ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ - __start_data_ro_after_init = .; \ + VMLINUX_SYMBOL(__start_data_ro_after_init) = .; \ *(.data..ro_after_init) \ - __end_data_ro_after_init = .; + VMLINUX_SYMBOL(__end_data_ro_after_init) = .;#endif /*
Quoted 1 line
Jessica
Do you have a moment to send this? I'd like to get it in for v4.11 (my renaming has landed, so you'll have to rebase). If not, I can do it. :)
-Kees
Signature · 2 lines
Kees Cook Pixel Security