Commit 702b16d7 authored by Marco Elver's avatar Marco Elver Committed by Linus Torvalds
Browse files

kfence: fix printk format for ptrdiff_t 

Use %td for ptrdiff_t.

Link: https://lkml.kernel.org/r/3abbe4c9-16ad-c168-a90f-087978ccd8f7@csgroup.eu
Link: https://lkml.kernel.org/r/20210303121157.3430807-1-elver@google.com


Signed-off-by: default avatarMarco Elver <elver@google.com>
Reported-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarAlexander Potapenko <glider@google.com>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97e49102

mm/kfence/report.c

+6 −6
Original line number Diff line number Diff line
@@ -116,12 +116,12 @@ void kfence_print_object(struct seq_file *seq, const struct kfence_metadata *met 
	lockdep_assert_held(&meta->lock);



	if (meta->state == KFENCE_OBJECT_UNUSED) {

		seq_con_printf(seq, "kfence-#%zd unused\n", meta - kfence_metadata);

		seq_con_printf(seq, "kfence-#%td unused\n", meta - kfence_metadata);

		return;

	}



	seq_con_printf(seq,

		       "kfence-#%zd [0x%p-0x%p"

		       "kfence-#%td [0x%p-0x%p"

		       ", size=%d, cache=%s] allocated by task %d:\n",

		       meta - kfence_metadata, (void *)start, (void *)(start + size - 1), size,

		       (cache && cache->name) ? cache->name : "<destroyed>", meta->alloc_track.pid);
@@ -204,7 +204,7 @@ void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *r 


		pr_err("BUG: KFENCE: out-of-bounds %s in %pS\n\n", get_access_type(is_write),

		       (void *)stack_entries[skipnr]);

		pr_err("Out-of-bounds %s at 0x%p (%luB %s of kfence-#%zd):\n",

		pr_err("Out-of-bounds %s at 0x%p (%luB %s of kfence-#%td):\n",

		       get_access_type(is_write), (void *)address,

		       left_of_object ? meta->addr - address : address - meta->addr,

		       left_of_object ? "left" : "right", object_index);
@@ -213,14 +213,14 @@ void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *r 
	case KFENCE_ERROR_UAF:

		pr_err("BUG: KFENCE: use-after-free %s in %pS\n\n", get_access_type(is_write),

		       (void *)stack_entries[skipnr]);

		pr_err("Use-after-free %s at 0x%p (in kfence-#%zd):\n",

		pr_err("Use-after-free %s at 0x%p (in kfence-#%td):\n",

		       get_access_type(is_write), (void *)address, object_index);

		break;

	case KFENCE_ERROR_CORRUPTION:

		pr_err("BUG: KFENCE: memory corruption in %pS\n\n", (void *)stack_entries[skipnr]);

		pr_err("Corrupted memory at 0x%p ", (void *)address);

		print_diff_canary(address, 16, meta);

		pr_cont(" (in kfence-#%zd):\n", object_index);

		pr_cont(" (in kfence-#%td):\n", object_index);

		break;

	case KFENCE_ERROR_INVALID:

		pr_err("BUG: KFENCE: invalid %s in %pS\n\n", get_access_type(is_write),
@@ -230,7 +230,7 @@ void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *r 
		break;

	case KFENCE_ERROR_INVALID_FREE:

		pr_err("BUG: KFENCE: invalid free in %pS\n\n", (void *)stack_entries[skipnr]);

		pr_err("Invalid free of 0x%p (in kfence-#%zd):\n", (void *)address,

		pr_err("Invalid free of 0x%p (in kfence-#%td):\n", (void *)address,

		       object_index);

		break;

	}