Commit 41bfad50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'modules-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux 

Pull modules updates from Petr Pavlu:

 - Sign modules with sha512 instead of sha1 by default

 - Don't fail module loading when failing to set the
   ro_after_init section read-only

 - Constify 'struct module_attribute'

 - Cleanups and preparation for const struct bin_attribute

 - Put known GPL offenders in an array

 - Extend the preempt disabled section in
   dereference_symbol_descriptor()

* tag 'modules-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux:
  module: sign with sha512 instead of sha1 by default
  module: Don't fail module loading when setting ro_after_init section RO failed
  module: Split module_enable_rodata_ro()
  module: sysfs: Use const 'struct bin_attribute'
  module: sysfs: Add notes attributes through attribute_group
  module: sysfs: Simplify section attribute allocation
  module: sysfs: Drop 'struct module_sect_attr'
  module: sysfs: Drop member 'module_sect_attr::address'
  module: sysfs: Drop member 'module_sect_attrs::nsections'
  module: Constify 'struct module_attribute'
  module: Handle 'struct module_version_attribute' as const
  params: Prepare for 'const struct module_attribute *'
  module: Put known GPL offenders in an array
  module: Extend the preempt disabled section in dereference_symbol_descriptor().
parents 40648d24 f3b93547

include/linux/kallsyms.h

+1 −1
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ static inline void *dereference_symbol_descriptor(void *ptr) 


	preempt_disable();

	mod = __module_address((unsigned long)ptr);

	preempt_enable();



	if (mod)

		ptr = dereference_module_function_descriptor(mod, ptr);

	preempt_enable();

#endif

	return ptr;

}

include/linux/module.h

+5 −5
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ struct module_kobject { 


struct module_attribute {

	struct attribute attr;

	ssize_t (*show)(struct module_attribute *, struct module_kobject *,

	ssize_t (*show)(const struct module_attribute *, struct module_kobject *,

			char *);

	ssize_t (*store)(struct module_attribute *, struct module_kobject *,

	ssize_t (*store)(const struct module_attribute *, struct module_kobject *,

			 const char *, size_t count);

	void (*setup)(struct module *, const char *);

	int (*test)(struct module *);
@@ -67,10 +67,10 @@ struct module_version_attribute { 
	const char *version;

};



extern ssize_t __modver_version_show(struct module_attribute *,

extern ssize_t __modver_version_show(const struct module_attribute *,

				     struct module_kobject *, char *);



extern struct module_attribute module_uevent;

extern const struct module_attribute module_uevent;



/* These are either module local, or the kernel's dummy ones. */

extern int init_module(void);
@@ -275,7 +275,7 @@ extern typeof(name) __mod_device_table__##type##__##name \ 
#else

#define MODULE_VERSION(_version)					\

	MODULE_INFO(version, _version);					\

	static struct module_version_attribute __modver_attr		\

	static const struct module_version_attribute __modver_attr	\

		__used __section("__modver")				\

		__aligned(__alignof__(struct module_version_attribute)) \

		= {							\

kernel/module/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ comment "Do not forget to sign required modules with scripts/sign-file" 
choice

	prompt "Hash algorithm to sign modules"

	depends on MODULE_SIG || IMA_APPRAISE_MODSIG

	default MODULE_SIG_SHA512

	help

	  This determines which sort of hashing algorithm will be used during

	  signature generation.  This algorithm _must_ be built into the kernel

kernel/module/internal.h

+4 −3
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ struct kernel_symbol { 
extern struct mutex module_mutex;

extern struct list_head modules;



extern struct module_attribute *modinfo_attrs[];

extern size_t modinfo_attrs_count;

extern const struct module_attribute *const modinfo_attrs[];

extern const size_t modinfo_attrs_count;



/* Provided by the linker */

extern const struct kernel_symbol __start___ksymtab[];
@@ -327,7 +327,8 @@ static inline struct module *mod_find(unsigned long addr, struct mod_tree_root * 
}

#endif /* CONFIG_MODULES_TREE_LOOKUP */



int module_enable_rodata_ro(const struct module *mod, bool after_init);

int module_enable_rodata_ro(const struct module *mod);

int module_enable_rodata_ro_after_init(const struct module *mod);

int module_enable_data_nx(const struct module *mod);

int module_enable_text_rox(const struct module *mod);

int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,

kernel/module/main.c

+40 −34
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static void setup_modinfo_##field(struct module *mod, const char *s) \ 
{                                                                     \

	mod->field = kstrdup(s, GFP_KERNEL);                          \

}                                                                     \

static ssize_t show_modinfo_##field(struct module_attribute *mattr,   \

static ssize_t show_modinfo_##field(const struct module_attribute *mattr, \

			struct module_kobject *mk, char *buffer)      \

{                                                                     \

	return scnprintf(buffer, PAGE_SIZE, "%s\n", mk->mod->field);  \
@@ -552,7 +552,7 @@ static void free_modinfo_##field(struct module *mod) \ 
	kfree(mod->field);                                            \

	mod->field = NULL;                                            \

}                                                                     \

static struct module_attribute modinfo_##field = {                    \

static const struct module_attribute modinfo_##field = {              \

	.attr = { .name = __stringify(field), .mode = 0444 },         \

	.show = show_modinfo_##field,                                 \

	.setup = setup_modinfo_##field,                               \
@@ -842,13 +842,13 @@ void symbol_put_addr(void *addr) 
}

EXPORT_SYMBOL_GPL(symbol_put_addr);



static ssize_t show_refcnt(struct module_attribute *mattr,

static ssize_t show_refcnt(const struct module_attribute *mattr,

			   struct module_kobject *mk, char *buffer)

{

	return sprintf(buffer, "%i\n", module_refcount(mk->mod));

}



static struct module_attribute modinfo_refcnt =

static const struct module_attribute modinfo_refcnt =

	__ATTR(refcnt, 0444, show_refcnt, NULL);



void __module_get(struct module *module)
@@ -917,7 +917,7 @@ size_t module_flags_taint(unsigned long taints, char *buf) 
	return l;

}



static ssize_t show_initstate(struct module_attribute *mattr,

static ssize_t show_initstate(const struct module_attribute *mattr,

			      struct module_kobject *mk, char *buffer)

{

	const char *state = "unknown";
@@ -938,10 +938,10 @@ static ssize_t show_initstate(struct module_attribute *mattr, 
	return sprintf(buffer, "%s\n", state);

}



static struct module_attribute modinfo_initstate =

static const struct module_attribute modinfo_initstate =

	__ATTR(initstate, 0444, show_initstate, NULL);



static ssize_t store_uevent(struct module_attribute *mattr,

static ssize_t store_uevent(const struct module_attribute *mattr,

			    struct module_kobject *mk,

			    const char *buffer, size_t count)

{
@@ -951,10 +951,10 @@ static ssize_t store_uevent(struct module_attribute *mattr, 
	return rc ? rc : count;

}



struct module_attribute module_uevent =

const struct module_attribute module_uevent =

	__ATTR(uevent, 0200, NULL, store_uevent);



static ssize_t show_coresize(struct module_attribute *mattr,

static ssize_t show_coresize(const struct module_attribute *mattr,

			     struct module_kobject *mk, char *buffer)

{

	unsigned int size = mk->mod->mem[MOD_TEXT].size;
@@ -966,11 +966,11 @@ static ssize_t show_coresize(struct module_attribute *mattr, 
	return sprintf(buffer, "%u\n", size);

}



static struct module_attribute modinfo_coresize =

static const struct module_attribute modinfo_coresize =

	__ATTR(coresize, 0444, show_coresize, NULL);



#ifdef CONFIG_ARCH_WANTS_MODULES_DATA_IN_VMALLOC

static ssize_t show_datasize(struct module_attribute *mattr,

static ssize_t show_datasize(const struct module_attribute *mattr,

			     struct module_kobject *mk, char *buffer)

{

	unsigned int size = 0;
@@ -980,11 +980,11 @@ static ssize_t show_datasize(struct module_attribute *mattr, 
	return sprintf(buffer, "%u\n", size);

}



static struct module_attribute modinfo_datasize =

static const struct module_attribute modinfo_datasize =

	__ATTR(datasize, 0444, show_datasize, NULL);

#endif



static ssize_t show_initsize(struct module_attribute *mattr,

static ssize_t show_initsize(const struct module_attribute *mattr,

			     struct module_kobject *mk, char *buffer)

{

	unsigned int size = 0;
@@ -994,10 +994,10 @@ static ssize_t show_initsize(struct module_attribute *mattr, 
	return sprintf(buffer, "%u\n", size);

}



static struct module_attribute modinfo_initsize =

static const struct module_attribute modinfo_initsize =

	__ATTR(initsize, 0444, show_initsize, NULL);



static ssize_t show_taint(struct module_attribute *mattr,

static ssize_t show_taint(const struct module_attribute *mattr,

			  struct module_kobject *mk, char *buffer)

{

	size_t l;
@@ -1007,10 +1007,10 @@ static ssize_t show_taint(struct module_attribute *mattr, 
	return l;

}



static struct module_attribute modinfo_taint =

static const struct module_attribute modinfo_taint =

	__ATTR(taint, 0444, show_taint, NULL);



struct module_attribute *modinfo_attrs[] = {

const struct module_attribute *const modinfo_attrs[] = {

	&module_uevent,

	&modinfo_version,

	&modinfo_srcversion,
@@ -1027,7 +1027,7 @@ struct module_attribute *modinfo_attrs[] = { 
	NULL,

};



size_t modinfo_attrs_count = ARRAY_SIZE(modinfo_attrs);

const size_t modinfo_attrs_count = ARRAY_SIZE(modinfo_attrs);



static const char vermagic[] = VERMAGIC_STRING;
@@ -1681,7 +1681,7 @@ static void module_license_taint_check(struct module *mod, const char *license) 


static void setup_modinfo(struct module *mod, struct load_info *info)

{

	struct module_attribute *attr;

	const struct module_attribute *attr;

	int i;



	for (i = 0; (attr = modinfo_attrs[i]); i++) {
@@ -1692,7 +1692,7 @@ static void setup_modinfo(struct module *mod, struct load_info *info) 


static void free_modinfo(struct module *mod)

{

	struct module_attribute *attr;

	const struct module_attribute *attr;

	int i;



	for (i = 0; (attr = modinfo_attrs[i]); i++) {
@@ -2332,11 +2332,20 @@ static int rewrite_section_headers(struct load_info *info, int flags) 
	return 0;

}



static const char *const module_license_offenders[] = {

	/* driverloader was caught wrongly pretending to be under GPL */

	"driverloader",



	/* lve claims to be GPL but upstream won't provide source */

	"lve",

};



/*

 * These calls taint the kernel depending certain module circumstances */

static void module_augment_kernel_taints(struct module *mod, struct load_info *info)

{

	int prev_taint = test_taint(TAINT_PROPRIETARY_MODULE);

	size_t i;



	if (!get_modinfo(info, "intree")) {

		if (!test_taint(TAINT_OOT_MODULE))
@@ -2385,15 +2394,11 @@ static void module_augment_kernel_taints(struct module *mod, struct load_info *i 
	if (strcmp(mod->name, "ndiswrapper") == 0)

		add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE);



	/* driverloader was caught wrongly pretending to be under GPL */

	if (strcmp(mod->name, "driverloader") == 0)

		add_taint_module(mod, TAINT_PROPRIETARY_MODULE,

				 LOCKDEP_NOW_UNRELIABLE);



	/* lve claims to be GPL but upstream won't provide source */

	if (strcmp(mod->name, "lve") == 0)

	for (i = 0; i < ARRAY_SIZE(module_license_offenders); ++i) {

		if (strcmp(mod->name, module_license_offenders[i]) == 0)

			add_taint_module(mod, TAINT_PROPRIETARY_MODULE,

					 LOCKDEP_NOW_UNRELIABLE);

	}



	if (!prev_taint && test_taint(TAINT_PROPRIETARY_MODULE))

		pr_warn("%s: module license taints kernel.\n", mod->name);
@@ -2948,9 +2953,12 @@ static noinline int do_init_module(struct module *mod) 
	/* Switch to core kallsyms now init is done: kallsyms may be walking! */

	rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms);

#endif

	ret = module_enable_rodata_ro(mod, true);

	ret = module_enable_rodata_ro_after_init(mod);

	if (ret)

		goto fail_mutex_unlock;

		pr_warn("%s: module_enable_rodata_ro_after_init() returned %d, "

			"ro_after_init data might still be writable\n",

			mod->name, ret);



	mod_tree_remove_init(mod);

	module_arch_freeing_init(mod);

	for_class_mod_mem_type(type, init) {
@@ -2989,8 +2997,6 @@ static noinline int do_init_module(struct module *mod) 


	return 0;



fail_mutex_unlock:

	mutex_unlock(&module_mutex);

fail_free_freeinit:

	kfree(freeinit);

fail:
@@ -3118,7 +3124,7 @@ static int complete_formation(struct module *mod, struct load_info *info) 
	module_bug_finalize(info->hdr, info->sechdrs, mod);

	module_cfi_finalize(info->hdr, info->sechdrs, mod);



	err = module_enable_rodata_ro(mod, false);

	err = module_enable_rodata_ro(mod);

	if (err)

		goto out_strict_rwx;

	err = module_enable_data_nx(mod);