Commit 0b847801 authored by Kees Cook's avatar Kees Cook Committed by Andrew Morton
Browse files

mm/kmemleak: replace strncpy() with strscpy() 

Replace the depreciated[1] strncpy() calls with strscpy().  Uses of
object->comm do not depend on the padding side-effect.

Link: https://github.com/KSPP/linux/issues/90 [1]
Link: https://lkml.kernel.org/r/20240710001300.work.004-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 53dabce2

mm/kmemleak.c

+3 −3
Original line number Diff line number Diff line
@@ -657,10 +657,10 @@ static struct kmemleak_object *__alloc_object(gfp_t gfp) 
	/* task information */

	if (in_hardirq()) {

		object->pid = 0;

		strncpy(object->comm, "hardirq", sizeof(object->comm));

		strscpy(object->comm, "hardirq");

	} else if (in_serving_softirq()) {

		object->pid = 0;

		strncpy(object->comm, "softirq", sizeof(object->comm));

		strscpy(object->comm, "softirq");

	} else {

		object->pid = current->pid;

		/*
@@ -669,7 +669,7 @@ static struct kmemleak_object *__alloc_object(gfp_t gfp) 
		 * dependency issues with current->alloc_lock. In the worst

		 * case, the command line is not correct.

		 */

		strncpy(object->comm, current->comm, sizeof(object->comm));

		strscpy(object->comm, current->comm);

	}



	/* kernel backtrace */