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

Commit cdfe1565 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull virtio and module fixes from Rusty Russell:
 "YA module signing build tweak, and two cc'd to stable."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio: Don't access index after unregister.
  modules: don't break modules_install on external modules with no key.
  module: fix out-by-one error in kallsyms
parents a601e637 237242bd

drivers/virtio/virtio.c

+3 −1
Original line number Diff line number Diff line
@@ -225,8 +225,10 @@ EXPORT_SYMBOL_GPL(register_virtio_device); 


void unregister_virtio_device(struct virtio_device *dev)

{

	int index = dev->index; /* save for after device release */



	device_unregister(&dev->dev);

	ida_simple_remove(&virtio_index_ida, dev->index);

	ida_simple_remove(&virtio_index_ida, index);

}

EXPORT_SYMBOL_GPL(unregister_virtio_device);

kernel/module.c

+16 −11
Original line number Diff line number Diff line
@@ -2293,12 +2293,17 @@ static void layout_symtab(struct module *mod, struct load_info *info) 
	src = (void *)info->hdr + symsect->sh_offset;

	nsrc = symsect->sh_size / sizeof(*src);



	/* strtab always starts with a nul, so offset 0 is the empty string. */

	strtab_size = 1;



	/* Compute total space required for the core symbols' strtab. */

	for (ndst = i = strtab_size = 1; i < nsrc; ++i, ++src)

		if (is_core_symbol(src, info->sechdrs, info->hdr->e_shnum)) {

			strtab_size += strlen(&info->strtab[src->st_name]) + 1;

	for (ndst = i = 0; i < nsrc; i++) {

		if (i == 0 ||

		    is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum)) {

			strtab_size += strlen(&info->strtab[src[i].st_name])+1;

			ndst++;

		}

	}



	/* Append room for core symbols at end of core part. */

	info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
@@ -2332,15 +2337,15 @@ static void add_kallsyms(struct module *mod, const struct load_info *info) 
	mod->core_symtab = dst = mod->module_core + info->symoffs;

	mod->core_strtab = s = mod->module_core + info->stroffs;

	src = mod->symtab;

	*dst = *src;

	*s++ = 0;

	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {

		if (!is_core_symbol(src, info->sechdrs, info->hdr->e_shnum))

			continue;



		dst[ndst] = *src;

	for (ndst = i = 0; i < mod->num_symtab; i++) {

		if (i == 0 ||

		    is_core_symbol(src+i, info->sechdrs, info->hdr->e_shnum)) {

			dst[ndst] = src[i];

			dst[ndst++].st_name = s - mod->core_strtab;

		s += strlcpy(s, &mod->strtab[src->st_name], KSYM_NAME_LEN) + 1;

			s += strlcpy(s, &mod->strtab[src[i].st_name],

				     KSYM_NAME_LEN) + 1;

		}

	}

	mod->core_num_syms = ndst;

}

scripts/Makefile.modinst

+2 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ PHONY += $(modules) 
__modinst: $(modules)

	@:



# Don't stop modules_install if we can't sign external modules.

quiet_cmd_modules_install = INSTALL $@

      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@)

      cmd_modules_install = mkdir -p $(2); cp $@ $(2) ; $(mod_strip_cmd) $(2)/$(notdir $@) ; $(mod_sign_cmd) $(2)/$(notdir $@) $(patsubst %,|| true,$(KBUILD_EXTMOD))



# Modules built outside the kernel source tree go into extra by default

INSTALL_MOD_DIR ?= extra