module: make module_ktype structure constant

Message ID 20230204-kobj_type-module-v1-1-40df5b474e9d@weissschuh.net
State New
Headers
Series module: make module_ktype structure constant |

Commit Message

Thomas Weißschuh Feb. 4, 2023, 5:44 a.m. UTC
  Since commit ee6d3dd4ed48 ("driver core: make kobj_type constant.")
the driver core allows the usage of const struct kobj_type.

Take advantage of this to constify the structure definition to prevent
modification at runtime.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 include/linux/module.h | 2 +-
 kernel/params.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


---
base-commit: 0136d86b78522bbd5755f8194c97a987f0586ba5
change-id: 20230204-kobj_type-module-8d15fbee43a5

Best regards,
  

Comments

Luis Chamberlain Feb. 21, 2023, 10 p.m. UTC | #1
On Sat, Feb 04, 2023 at 05:44:46AM +0000, Thomas Weißschuh wrote:
> Since commit ee6d3dd4ed48 ("driver core: make kobj_type constant.")
> the driver core allows the usage of const struct kobj_type.
> 
> Take advantage of this to constify the structure definition to prevent
> modification at runtime.
> 
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>

Thanks! Queued onto modules-next.

  Luis
  

Patch

diff --git a/include/linux/module.h b/include/linux/module.h
index 8c5909c0076c..701869049be2 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -826,7 +826,7 @@  void *dereference_module_function_descriptor(struct module *mod, void *ptr)
 
 #ifdef CONFIG_SYSFS
 extern struct kset *module_kset;
-extern struct kobj_type module_ktype;
+extern const struct kobj_type module_ktype;
 #endif /* CONFIG_SYSFS */
 
 #define symbol_request(x) try_then_request_module(symbol_get(x), "symbol:" #x)
diff --git a/kernel/params.c b/kernel/params.c
index 14d66070757b..049d7078fb21 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -947,7 +947,7 @@  static void module_kobj_release(struct kobject *kobj)
 	complete(mk->kobj_completion);
 }
 
-struct kobj_type module_ktype = {
+const struct kobj_type module_ktype = {
 	.release   =	module_kobj_release,
 	.sysfs_ops =	&module_sysfs_ops,
 };