mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
e4dca7b7aa
Several function prototypes for the set/get functions defined by
module_param_call() have a slightly wrong argument types. This fixes
those in an effort to clean up the calls when running under type-enforced
compiler instrumentation for CFI. This is the result of running the
following semantic patch:
@match_module_param_call_function@
declarer name module_param_call;
identifier _name, _set_func, _get_func;
expression _arg, _mode;
@@
module_param_call(_name, _set_func, _get_func, _arg, _mode);
@fix_set_prototype
depends on match_module_param_call_function@
identifier match_module_param_call_function._set_func;
identifier _val, _param;
type _val_type, _param_type;
@@
int _set_func(
-_val_type _val
+const char * _val
,
-_param_type _param
+const struct kernel_param * _param
) { ... }
@fix_get_prototype
depends on match_module_param_call_function@
identifier match_module_param_call_function._get_func;
identifier _val, _param;
type _val_type, _param_type;
@@
int _get_func(
-_val_type _val
+char * _val
,
-_param_type _param
+const struct kernel_param * _param
) { ... }
Two additional by-hand changes are included for places where the above
Coccinelle script didn't notice them:
drivers/platform/x86/thinkpad_acpi.c
fs/lockd/svc.c
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
168 lines
3.3 KiB
C
168 lines
3.3 KiB
C
/*
|
|
* edac_module.c
|
|
*
|
|
* (C) 2007 www.softwarebitmaker.com
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*
|
|
* Author: Doug Thompson <dougthompson@xmission.com>
|
|
*
|
|
*/
|
|
#include <linux/edac.h>
|
|
|
|
#include "edac_mc.h"
|
|
#include "edac_module.h"
|
|
|
|
#define EDAC_VERSION "Ver: 3.0.0"
|
|
|
|
#ifdef CONFIG_EDAC_DEBUG
|
|
|
|
static int edac_set_debug_level(const char *buf,
|
|
const struct kernel_param *kp)
|
|
{
|
|
unsigned long val;
|
|
int ret;
|
|
|
|
ret = kstrtoul(buf, 0, &val);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (val > 4)
|
|
return -EINVAL;
|
|
|
|
return param_set_int(buf, kp);
|
|
}
|
|
|
|
/* Values of 0 to 4 will generate output */
|
|
int edac_debug_level = 2;
|
|
EXPORT_SYMBOL_GPL(edac_debug_level);
|
|
|
|
module_param_call(edac_debug_level, edac_set_debug_level, param_get_int,
|
|
&edac_debug_level, 0644);
|
|
MODULE_PARM_DESC(edac_debug_level, "EDAC debug level: [0-4], default: 2");
|
|
#endif
|
|
|
|
/*
|
|
* edac_op_state_to_string()
|
|
*/
|
|
char *edac_op_state_to_string(int opstate)
|
|
{
|
|
if (opstate == OP_RUNNING_POLL)
|
|
return "POLLED";
|
|
else if (opstate == OP_RUNNING_INTERRUPT)
|
|
return "INTERRUPT";
|
|
else if (opstate == OP_RUNNING_POLL_INTR)
|
|
return "POLL-INTR";
|
|
else if (opstate == OP_ALLOC)
|
|
return "ALLOC";
|
|
else if (opstate == OP_OFFLINE)
|
|
return "OFFLINE";
|
|
|
|
return "UNKNOWN";
|
|
}
|
|
|
|
/*
|
|
* sysfs object: /sys/devices/system/edac
|
|
* need to export to other files
|
|
*/
|
|
static struct bus_type edac_subsys = {
|
|
.name = "edac",
|
|
.dev_name = "edac",
|
|
};
|
|
|
|
static int edac_subsys_init(void)
|
|
{
|
|
int err;
|
|
|
|
/* create the /sys/devices/system/edac directory */
|
|
err = subsys_system_register(&edac_subsys, NULL);
|
|
if (err)
|
|
printk(KERN_ERR "Error registering toplevel EDAC sysfs dir\n");
|
|
|
|
return err;
|
|
}
|
|
|
|
static void edac_subsys_exit(void)
|
|
{
|
|
bus_unregister(&edac_subsys);
|
|
}
|
|
|
|
/* return pointer to the 'edac' node in sysfs */
|
|
struct bus_type *edac_get_sysfs_subsys(void)
|
|
{
|
|
return &edac_subsys;
|
|
}
|
|
EXPORT_SYMBOL_GPL(edac_get_sysfs_subsys);
|
|
/*
|
|
* edac_init
|
|
* module initialization entry point
|
|
*/
|
|
static int __init edac_init(void)
|
|
{
|
|
int err = 0;
|
|
|
|
edac_printk(KERN_INFO, EDAC_MC, EDAC_VERSION "\n");
|
|
|
|
err = edac_subsys_init();
|
|
if (err)
|
|
return err;
|
|
|
|
/*
|
|
* Harvest and clear any boot/initialization PCI parity errors
|
|
*
|
|
* FIXME: This only clears errors logged by devices present at time of
|
|
* module initialization. We should also do an initial clear
|
|
* of each newly hotplugged device.
|
|
*/
|
|
edac_pci_clear_parity_errors();
|
|
|
|
err = edac_mc_sysfs_init();
|
|
if (err)
|
|
goto err_sysfs;
|
|
|
|
edac_debugfs_init();
|
|
|
|
err = edac_workqueue_setup();
|
|
if (err) {
|
|
edac_printk(KERN_ERR, EDAC_MC, "Failure initializing workqueue\n");
|
|
goto err_wq;
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_wq:
|
|
edac_debugfs_exit();
|
|
edac_mc_sysfs_exit();
|
|
|
|
err_sysfs:
|
|
edac_subsys_exit();
|
|
|
|
return err;
|
|
}
|
|
|
|
/*
|
|
* edac_exit()
|
|
* module exit/termination function
|
|
*/
|
|
static void __exit edac_exit(void)
|
|
{
|
|
edac_dbg(0, "\n");
|
|
|
|
/* tear down the various subsystems */
|
|
edac_workqueue_teardown();
|
|
edac_mc_sysfs_exit();
|
|
edac_debugfs_exit();
|
|
edac_subsys_exit();
|
|
}
|
|
|
|
/*
|
|
* Inform the kernel of our entry and exit points
|
|
*/
|
|
subsys_initcall(edac_init);
|
|
module_exit(edac_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Doug Thompson www.softwarebitmaker.com, et al");
|
|
MODULE_DESCRIPTION("Core library routines for EDAC reporting");
|