Commit 45c680b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching 

Pull livepatching fix from Jiri Kosina:
 "Livepatching error handling fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Improve error handling in klp_disable_func()
parents 851328fe 225f58fb

kernel/livepatch/core.c

+4 −2
Original line number Diff line number Diff line
@@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func) 
{

	struct klp_ops *ops;



	WARN_ON(func->state != KLP_ENABLED);

	WARN_ON(!func->old_addr);

	if (WARN_ON(func->state != KLP_ENABLED))

		return;

	if (WARN_ON(!func->old_addr))

		return;



	ops = klp_find_ops(func->old_addr);

	if (WARN_ON(!ops))