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

Commit 9043a265 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull module update from Rusty Russell:
 "The sweeping change is to make add_taint() explicitly indicate whether
  to disable lockdep, but it's a mechanical change."

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MODSIGN: Add option to not sign modules during modules_install
  MODSIGN: Add -s <signature> option to sign-file
  MODSIGN: Specify the hash algorithm on sign-file command line
  MODSIGN: Simplify Makefile with a Kconfig helper
  module: clean up load_module a little more.
  modpost: Ignore ARC specific non-alloc sections
  module: constify within_module_*
  taint: add explicit flag to show whether lock dep is still OK.
  module: printk message when module signature fail taints kernel.
parents ab782659 d9d8d7ed

Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -720,11 +720,11 @@ endif # INSTALL_MOD_STRIP 
export mod_strip_cmd

export mod_strip_cmd









ifeq ($(CONFIG_MODULE_SIG),y)

ifdef CONFIG_MODULE_SIG_ALL

MODSECKEY = ./signing_key.priv

MODSECKEY = ./signing_key.priv

MODPUBKEY = ./signing_key.x509

MODPUBKEY = ./signing_key.x509

export MODPUBKEY

export MODPUBKEY

mod_sign_cmd = perl $(srctree)/scripts/sign-file $(MODSECKEY) $(MODPUBKEY)

mod_sign_cmd = perl $(srctree)/scripts/sign-file $(CONFIG_MODULE_SIG_HASH) $(MODSECKEY) $(MODPUBKEY)

else

else

mod_sign_cmd = true

mod_sign_cmd = true

endif

endif

arch/alpha/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15) 
#endif

#endif

	printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);

	printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);

	dik_show_regs(regs, r9_15);

	dik_show_regs(regs, r9_15);

	add_taint(TAINT_DIE);

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	dik_show_trace((unsigned long *)(regs+1));

	dik_show_trace((unsigned long *)(regs+1));

	dik_show_code((unsigned int *)regs->pc);

	dik_show_code((unsigned int *)regs->pc);

arch/arm/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr) 




	bust_spinlocks(0);

	bust_spinlocks(0);

	die_owner = -1;

	die_owner = -1;

	add_taint(TAINT_DIE);

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	die_nest_count--;

	die_nest_count--;

	if (!die_nest_count)

	if (!die_nest_count)

		/* Nest count reaches zero, release the lock. */

		/* Nest count reaches zero, release the lock. */

arch/arm64/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -242,7 +242,7 @@ void die(const char *str, struct pt_regs *regs, int err) 
		crash_kexec(regs);

		crash_kexec(regs);





	bust_spinlocks(0);

	bust_spinlocks(0);

	add_taint(TAINT_DIE);

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	raw_spin_unlock_irq(&die_lock);

	raw_spin_unlock_irq(&die_lock);

	oops_exit();

	oops_exit();

arch/avr32/kernel/traps.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ void die(const char *str, struct pt_regs *regs, long err) 
	show_regs_log_lvl(regs, KERN_EMERG);

	show_regs_log_lvl(regs, KERN_EMERG);

	show_stack_log_lvl(current, regs->sp, regs, KERN_EMERG);

	show_stack_log_lvl(current, regs->sp, regs, KERN_EMERG);

	bust_spinlocks(0);

	bust_spinlocks(0);

	add_taint(TAINT_DIE);

	add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);

	spin_unlock_irq(&die_lock);

	spin_unlock_irq(&die_lock);





	if (in_interrupt())

	if (in_interrupt())