summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkinobu Mita2006-01-08 10:04:29 +0100
committerLinus Torvalds2006-01-09 05:14:03 +0100
commitfb1697933a03ec47d794b38e2a4e3ccc2463fd22 (patch)
tree51612c8b20a338856aef323ea23ab7746cf0283c
parent[PATCH] modules: prevent overriding of symbols (diff)
downloadkernel-qcow2-linux-fb1697933a03ec47d794b38e2a4e3ccc2463fd22.tar.gz
kernel-qcow2-linux-fb1697933a03ec47d794b38e2a4e3ccc2463fd22.tar.xz
kernel-qcow2-linux-fb1697933a03ec47d794b38e2a4e3ccc2463fd22.zip
[PATCH] modules: mark TAINT_FORCED_RMMOD correctly
Currently TAINT_FORCED_RMMOD is totally unused. Because it is marked as TAINT_FORCED_MODULE instead when user forced a module unload. This patch marks it correctly Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Dave Jones <davej@codemonkey.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/module.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/module.c b/kernel/module.c
index fb6f091f5940..f368812ac0e8 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -496,15 +496,15 @@ static void module_unload_free(struct module *mod)
}
#ifdef CONFIG_MODULE_FORCE_UNLOAD
-static inline int try_force(unsigned int flags)
+static inline int try_force_unload(unsigned int flags)
{
int ret = (flags & O_TRUNC);
if (ret)
- add_taint(TAINT_FORCED_MODULE);
+ add_taint(TAINT_FORCED_RMMOD);
return ret;
}
#else
-static inline int try_force(unsigned int flags)
+static inline int try_force_unload(unsigned int flags)
{
return 0;
}
@@ -524,7 +524,7 @@ static int __try_stop_module(void *_sref)
/* If it's not unused, quit unless we are told to block. */
if ((sref->flags & O_NONBLOCK) && module_refcount(sref->mod) != 0) {
- if (!(*sref->forced = try_force(sref->flags)))
+ if (!(*sref->forced = try_force_unload(sref->flags)))
return -EWOULDBLOCK;
}
@@ -609,7 +609,7 @@ sys_delete_module(const char __user *name_user, unsigned int flags)
/* If it has an init func, it must have an exit func to unload */
if ((mod->init != NULL && mod->exit == NULL)
|| mod->unsafe) {
- forced = try_force(flags);
+ forced = try_force_unload(flags);
if (!forced) {
/* This module can't be removed */
ret = -EBUSY;