Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49019426 authored by Kees Cook's avatar Kees Cook Committed by Jessica Yu
Browse files

module: Pass struct load_info into symbol checks 



Since we're already using values from struct load_info, just pass this
pointer in directly and use what's needed as we need it. This allows us
to access future fields in struct load_info too.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJessica Yu <jeyu@redhat.com>
parent 08332893

kernel/module.c

+10 −12
Original line number Diff line number Diff line
@@ -1278,12 +1278,13 @@ static u32 resolve_rel_crc(const s32 *crc) 
	return *(u32 *)((void *)crc + *crc);

}



static int check_version(Elf_Shdr *sechdrs,

			 unsigned int versindex,

static int check_version(const struct load_info *info,

			 const char *symname,

			 struct module *mod,

			 const s32 *crc)

{

	Elf_Shdr *sechdrs = info->sechdrs;

	unsigned int versindex = info->index.vers;

	unsigned int i, num_versions;

	struct modversion_info *versions;
@@ -1326,8 +1327,7 @@ static int check_version(Elf_Shdr *sechdrs, 
	return 0;

}



static inline int check_modstruct_version(Elf_Shdr *sechdrs,

					  unsigned int versindex,

static inline int check_modstruct_version(const struct load_info *info,

					  struct module *mod)

{

	const s32 *crc;
@@ -1343,8 +1343,8 @@ static inline int check_modstruct_version(Elf_Shdr *sechdrs, 
		BUG();

	}

	preempt_enable();

	return check_version(sechdrs, versindex,

			     VMLINUX_SYMBOL_STR(module_layout), mod, crc);

	return check_version(info, VMLINUX_SYMBOL_STR(module_layout),

			     mod, crc);

}



/* First part is kernel version, which we ignore if module has crcs. */
@@ -1358,8 +1358,7 @@ static inline int same_magic(const char *amagic, const char *bmagic, 
	return strcmp(amagic, bmagic) == 0;

}

#else

static inline int check_version(Elf_Shdr *sechdrs,

				unsigned int versindex,

static inline int check_version(const struct load_info *info,

				const char *symname,

				struct module *mod,

				const s32 *crc)
@@ -1367,8 +1366,7 @@ static inline int check_version(Elf_Shdr *sechdrs, 
	return 1;

}



static inline int check_modstruct_version(Elf_Shdr *sechdrs,

					  unsigned int versindex,

static inline int check_modstruct_version(const struct load_info *info,

					  struct module *mod)

{

	return 1;
@@ -1404,7 +1402,7 @@ static const struct kernel_symbol *resolve_symbol(struct module *mod, 
	if (!sym)

		goto unlock;



	if (!check_version(info->sechdrs, info->index.vers, name, mod, crc)) {

	if (!check_version(info, name, mod, crc)) {

		sym = ERR_PTR(-EINVAL);

		goto getname;

	}
@@ -2971,7 +2969,7 @@ static struct module *setup_load_info(struct load_info *info, int flags) 
	info->index.pcpu = find_pcpusec(info);



	/* Check module struct version now, before we try to use module. */

	if (!check_modstruct_version(info->sechdrs, info->index.vers, mod))

	if (!check_modstruct_version(info, mod))

		return ERR_PTR(-ENOEXEC);



	return mod;