diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
| commit | 7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch) | |
| tree | 879f18ccbe274122f2d4f095b43cbc7f953e0ada /arch/s390/kernel/module.c | |
| parent | 48e315618dc4dc8904182cd221e3d395d5d97005 (diff) | |
| parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'arch/s390/kernel/module.c')
| -rw-r--r-- | arch/s390/kernel/module.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 0dc8ac8548ee..d298d3cb46d0 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c @@ -123,8 +123,8 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,  	/* Allocate one syminfo structure per symbol. */  	me->arch.nsyms = symtab->sh_size / sizeof(Elf_Sym); -	me->arch.syminfo = vmalloc(me->arch.nsyms * -				   sizeof(struct mod_arch_syminfo)); +	me->arch.syminfo = vmalloc(array_size(sizeof(struct mod_arch_syminfo), +					      me->arch.nsyms));  	if (!me->arch.syminfo)  		return -ENOMEM;  	symbols = (void *) hdr + symtab->sh_offset;  | 
