From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754859AbbI3HgZ (ORCPT <rfc822;w@1wt.eu>);
	Wed, 30 Sep 2015 03:36:25 -0400
Received: from www.linutronix.de ([62.245.132.108]:57368 "EHLO
	Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753907AbbI3HgV (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 30 Sep 2015 03:36:21 -0400
Date: Wed, 30 Sep 2015 09:35:29 +0200 (CEST)
From: Thomas Gleixner <tglx@linutronix.de>
To: Ingo Molnar <mingo@kernel.org>
cc: Andy Lutomirski <luto@amacapital.net>, Kees Cook <keescook@chromium.org>,
        Dmitry Vyukov <dvyukov@google.com>,
        Andrey Ryabinin <ryabinin.a.a@gmail.com>,
        Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
        Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@alien8.de>,
        Denys Vlasenko <dvlasenk@redhat.com>,
        "x86@kernel.org" <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
        Kostya Serebryany <kcc@google.com>,
        Alexander Potapenko <glider@google.com>,
        Andrey Konovalov <andreyknvl@google.com>,
        Sasha Levin <sasha.levin@oracle.com>, Andi Kleen <ak@linux.intel.com>,
        kasan-dev <kasan-dev@googlegroups.com>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Andrew Morton <akpm@linux-foundation.org>,
        Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH] fs/proc: Don't expose absolute kernel addresses via
 wchan
In-Reply-To: <20150930071537.GA19048@gmail.com>
Message-ID: <alpine.DEB.2.11.1509300934470.4500@nanos>
References: <1443430839-13225-1-git-send-email-dvyukov@google.com> <CAPAsAGwyUQc6UffyQ=vJSNwOYQWE9XMzK5dT__C4r5_+qEYfHA@mail.gmail.com> <CACT4Y+ZWgVz_4NEJbsZWYBHn91M7UNxMNUk_+SebtOfBAoN_LA@mail.gmail.com> <alpine.DEB.2.11.1509281830160.4500@nanos>
 <CALCETrWWsFB+aWKhadoaftNNjU=gRa15+7PXOR=3yrVzXuar6w@mail.gmail.com> <20150930071537.GA19048@gmail.com>
User-Agent: Alpine 2.11 (DEB 23 2013-08-11)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-Linutronix-Spam-Score: -1.0
X-Linutronix-Spam-Level: -
X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required,  ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 30 Sep 2015, Ingo Molnar wrote:
> diff --git a/fs/proc/array.c b/fs/proc/array.c
> index f60f0121e331..99082730b2ac 100644
> --- a/fs/proc/array.c
> +++ b/fs/proc/array.c
> @@ -507,7 +507,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
>  	seq_put_decimal_ull(m, ' ', task->blocked.sig[0] & 0x7fffffffUL);
>  	seq_put_decimal_ull(m, ' ', sigign.sig[0] & 0x7fffffffUL);
>  	seq_put_decimal_ull(m, ' ', sigcatch.sig[0] & 0x7fffffffUL);
> -	seq_put_decimal_ull(m, ' ', wchan);
> +	seq_puts(m, " 0"); /* Used to be numeric wchan - replaced by /proc/PID/wchan */

That should get rid of all wchan usage in do_task_stat()

Thanks,

	tglx