From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f196.google.com ([209.85.215.196]:36087 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730445AbeGYVgY (ORCPT ); Wed, 25 Jul 2018 17:36:24 -0400 Received: by mail-pg1-f196.google.com with SMTP id s7-v6so6020770pgv.3 for ; Wed, 25 Jul 2018 13:23:07 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Cc: Nick Desaulniers , Mark Salyzyn , Steven Rostedt , Ingo Molnar , kernel-team@android.com, stable@vger.kernel.org Subject: [PATCH] tracing: do not leak kernel addresses Date: Wed, 25 Jul 2018 13:22:36 -0700 Message-Id: <20180725202238.165314-1-salyzyn@android.com> Sender: stable-owner@vger.kernel.org List-ID: From: Nick Desaulniers Switch from 0x%lx to 0x%pK to print the kernel addresses. Fixes: CVE-2017-0630 Signed-off-by: Mark Salyzyn Cc: Nick Desaulniers Cc: Steven Rostedt Cc: Ingo Molnar Cc: Cc: # 3.18, 4.4, 4.9, 4.14 Cc: --- kernel/trace/trace_printk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index ad1d6164e946..93698023baf1 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -304,7 +304,7 @@ static int t_show(struct seq_file *m, void *v) if (!*fmt) return 0; - seq_printf(m, "0x%lx : \"", *(unsigned long *)fmt); + seq_printf(m, "0x%pK : \"", *(unsigned long *)fmt); /* * Tabs and new lines need to be converted. -- 2.18.0.233.g985f88cf7e-goog