Skip to content

Commit d83d42d

Browse files
shuahkhmcgrof
authored andcommitted
module: fix validate_section_offset() overflow bug on 64-bit
validate_section_offset() uses unsigned long local variable to add/store shdr->sh_offset and shdr->sh_size on all platforms. unsigned long is too short when sh_offset is Elf64_Off which would be the case on 64bit ELF headers. Without this fix applied we were shorting the design of modules to have section headers placed within the 32-bit boundary (4 GiB) instead of 64-bits when on 64-bit architectures (which allows for up to 16,777,216 TiB). In practice this just meant we were limiting modules sections to below 4 GiB even on 64-bit systems. This then should not really affect any real-world use case as modules these days obviously should likely never exceed 1 GiB in size overall. A specially crafted invalid module might succeed to skip validation in validate_section_offset() due to this mistake, but in such case no impact is observed through code inspection given the correct data types are used for the copy of the module when needed on move_module() when the section type is not SHT_NOBITS (which indicates no the section occupies no space on the file). Fix the overflow problem using the right size local variable when CONFIG_64BIT is defined. Signed-off-by: Shuah Khan <[email protected]> [mcgrof: expand commit log with possible impact if not applied] Signed-off-by: Luis Chamberlain <[email protected]>
1 parent fe91c47 commit d83d42d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

kernel/module.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2942,7 +2942,11 @@ static int module_sig_check(struct load_info *info, int flags)
29422942

29432943
static int validate_section_offset(struct load_info *info, Elf_Shdr *shdr)
29442944
{
2945+
#if defined(CONFIG_64BIT)
2946+
unsigned long long secend;
2947+
#else
29452948
unsigned long secend;
2949+
#endif
29462950

29472951
/*
29482952
* Check for both overflow and offset/size being

0 commit comments

Comments
 (0)