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

Commit 92618184 authored by Cong Wang's avatar Cong Wang Committed by Linus Torvalds
Browse files

lkdtm: avoid calling lkdtm_do_action() with spinlock held 



lkdtm_do_action() may call sleeping functions like kmalloc(), so do not
call it with spin lock held.

Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: default avatarDave Young <dyoung@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 99f02ef1

drivers/misc/lkdtm.c

+5 −1
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static void lkdtm_do_action(enum ctype which) 
static void lkdtm_handler(void)

{

	unsigned long flags;

	bool do_it = false;



	spin_lock_irqsave(&count_lock, flags);

	count--;
@@ -361,10 +362,13 @@ static void lkdtm_handler(void) 
			cp_name_to_str(cpoint), cp_type_to_str(cptype), count);



	if (count == 0) {

		lkdtm_do_action(cptype);

		do_it = true;

		count = cpoint_count;

	}

	spin_unlock_irqrestore(&count_lock, flags);



	if (do_it)

		lkdtm_do_action(cptype);

}



static int lkdtm_register_cpoint(enum cname which)