From: Kees Cook Date: Wed, 18 Oct 2017 02:04:43 +0000 (-0700) Subject: UPSTREAM: module: Do not paper over type mismatches in module_param_call() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57dad96bfcbf65ae893504c137693a98874bdaa8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git UPSTREAM: module: Do not paper over type mismatches in module_param_call() The module_param_call() macro was explicitly casting the .set and .get function prototypes away. This can lead to hard-to-find type mismatches. Now that all the function prototypes have been fixed tree-wide, we can drop these casts, and use named initializers too. Signed-off-by: Kees Cook Signed-off-by: Jessica Yu Bug: 67506682 Change-Id: I439c8b4b9f0108ac357267bbc396a63baec2b242 (cherry picked from commit ece1996a21eeb344b49200e627c6660111009c10) Signed-off-by: Sami Tolvanen --- diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index d94e5bef4a12..ba36506db4fb 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -228,9 +228,9 @@ struct kparam_array VERIFY_OCTAL_PERMISSIONS(perm), level, flags, { arg } } /* Obsolete - use module_param_cb() */ -#define module_param_call(name, set, get, arg, perm) \ +#define module_param_call(name, _set, _get, arg, perm) \ static const struct kernel_param_ops __param_ops_##name = \ - { .flags = 0, (void *)set, (void *)get }; \ + { .flags = 0, .set = _set, .get = _get }; \ __module_param_call(MODULE_PARAM_PREFIX, \ name, &__param_ops_##name, arg, perm, -1, 0)