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

Commit 5123662a authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

lkdtm: clean up sparse warnings 



Since lkdtm intentionally does "bad" things, we need to convince sparse
that we're doing these things on purpose. This adds an explicit cast
to the call to copy_to_user() and marks the spin lock as expecting
to dead-lock.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36fe66c1

drivers/misc/lkdtm.c

+4 −1
Original line number Diff line number Diff line
@@ -334,9 +334,10 @@ static void execute_location(void *dst) 


static void execute_user_location(void *dst)

{

	/* Intentionally crossing kernel/user memory boundary. */

	void (*func)(void) = dst;



	if (copy_to_user(dst, do_nothing, EXEC_SIZE))

	if (copy_to_user((void __user *)dst, do_nothing, EXEC_SIZE))

		return;

	func();

}
@@ -408,6 +409,8 @@ static void lkdtm_do_action(enum ctype which) 
	case CT_SPINLOCKUP:

		/* Must be called twice to trigger. */

		spin_lock(&lock_me_up);

		/* Let sparse know we intended to exit holding the lock. */

		__release(&lock_me_up);

		break;

	case CT_HUNG_TASK:

		set_current_state(TASK_UNINTERRUPTIBLE);