Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7522a842 authored by Ananth N Mavinakayanahalli's avatar Ananth N Mavinakayanahalli Committed by Linus Torvalds
Browse files

[PATCH] kprobes: NULL out non-relevant fields in struct kretprobe 



In cases where a struct kretprobe's *_handler fields are non-NULL, it is
possible to cause a system crash, due to the possibility of calls ending up
in zombie functions.  Documentation clearly states that unused *_handlers
should be set to NULL, but kprobe users sometimes fail to do so.

Fix it by setting the non-relevant fields of the struct kretprobe to NULL.

Signed-off-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Acked-by: default avatarJim Keniston <jkenisto@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5a7b46b3

kernel/kprobes.c

+3 −0
Original line number Diff line number Diff line
@@ -585,6 +585,9 @@ int __kprobes register_kretprobe(struct kretprobe *rp) 
	int i;



	rp->kp.pre_handler = pre_handler_kretprobe;

	rp->kp.post_handler = NULL;

	rp->kp.fault_handler = NULL;

	rp->kp.break_handler = NULL;



	/* Pre-allocate memory for max kretprobe instances */

	if (rp->maxactive <= 0) {