The patch titled kprobes: bugfix: try_module_get even if calling_mod is NULL has been added to the -mm tree. Its filename is kprobes-bugfix-try_module_get-even-if-calling_mod-is-null.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kprobes: bugfix: try_module_get even if calling_mod is NULL From: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Get probed module even if the caller is in the kernel core code. Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Cc: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx> Cc: Hiroshi Shimamoto <h-shimamoto@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/kprobes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/kprobes.c~kprobes-bugfix-try_module_get-even-if-calling_mod-is-null kernel/kprobes.c --- a/kernel/kprobes.c~kprobes-bugfix-try_module_get-even-if-calling_mod-is-null +++ a/kernel/kprobes.c @@ -630,7 +630,7 @@ static int __kprobes __register_kprobe(s * avoid incrementing the module refcount, so as to allow * unloading of self probing modules. */ - if (calling_mod && calling_mod != probed_mod) { + if (calling_mod != probed_mod) { if (unlikely(!try_module_get(probed_mod))) return -EINVAL; p->mod_refcounted = 1; _ Patches currently in -mm which might be from mhiramat@xxxxxxxxxx are kprobes-bugfix-try_module_get-even-if-calling_mod-is-null.patch kprobes-indirectly-call-kprobe_target.patch kprobes-add-tests-for-register_kprobes.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html