From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 311C9C433E1 for ; Fri, 10 Jul 2020 14:09:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 091E720836 for ; Fri, 10 Jul 2020 14:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594390173; bh=5fxYRNZaEf3WwSNJCGI+SYYktTeEynst8KjYwY2HCws=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=NMYHjloNoGEdOvYAEbHhBIdjlmjLWBjXpPYOSVdtDYDFRIHOSJifcJ0wZBxkaCbId fLj0nldJhyLbDi065WRq/9ASmXBmKBCe8dQys6OtnY8cmuxLuBmLjxiflj3GhQgwsn A/RQ9fXMxSptDXeBGCWj4hYXbvqCbzBmWB0qBWOg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727978AbgGJOJb (ORCPT ); Fri, 10 Jul 2020 10:09:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:54134 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726820AbgGJOJa (ORCPT ); Fri, 10 Jul 2020 10:09:30 -0400 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F09B20748; Fri, 10 Jul 2020 14:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594390170; bh=5fxYRNZaEf3WwSNJCGI+SYYktTeEynst8KjYwY2HCws=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ySwyUu3s7Op9GTBAs25t+cSBeExY6KM961X5qZHaNoswi+zL45hkTUktIDyprPRBK mOH0YvQkDOJ8Z4MEdMenrOVsR7T5aJKTgqmOR06+cs+H6ufX4qaLg96EUH6+GCCdkF dQjeYxkhT4RmHTy/OCSIhxnNn2rDnDytCK/IPF7I= Date: Fri, 10 Jul 2020 23:09:21 +0900 From: Masami Hiramatsu To: Kees Cook Cc: Dominik Czarnota , stable@vger.kernel.org, Jessica Yu , Linus Torvalds , Greg Kroah-Hartman , Andrew Morton , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , KP Singh , "Naveen N. Rao" , Anil S Keshavamurthy , "David S. Miller" , Masami Hiramatsu , Jakub Kicinski , "Steven Rostedt (VMware)" , Dmitry Safonov <0x7f454c46@gmail.com>, Will Deacon , Alexey Dobriyan , Marc Zyngier , Masahiro Yamada , Al Viro , Matteo Croce , Edward Cree , Nicolas Dichtel , Alexander Lobakin , Thomas Richter , Ingo Molnar , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/5] kprobes: Do not expose probe addresses to non-CAP_SYSLOG Message-Id: <20200710230921.7199e51fa19a7dce53823835@kernel.org> In-Reply-To: <20200702232638.2946421-5-keescook@chromium.org> References: <20200702232638.2946421-1-keescook@chromium.org> <20200702232638.2946421-5-keescook@chromium.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2 Jul 2020 16:26:37 -0700 Kees Cook wrote: > The kprobe show() functions were using "current"'s creds instead > of the file opener's creds for kallsyms visibility. Fix to use > seq_file->file->f_cred. This looks good to me. Acked-by: Masami Hiramatsu Thanks! > > Cc: stable@vger.kernel.org > Fixes: 81365a947de4 ("kprobes: Show address of kprobes if kallsyms does") > Fixes: ffb9bd68ebdb ("kprobes: Show blacklist addresses as same as kallsyms does") > Signed-off-by: Kees Cook > --- > kernel/kprobes.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c > index d4de217e4a91..2e97febeef77 100644 > --- a/kernel/kprobes.c > +++ b/kernel/kprobes.c > @@ -2448,7 +2448,7 @@ static void report_probe(struct seq_file *pi, struct kprobe *p, > else > kprobe_type = "k"; > > - if (!kallsyms_show_value(current_cred())) > + if (!kallsyms_show_value(pi->file->f_cred)) > addr = NULL; > > if (sym) > @@ -2540,7 +2540,7 @@ static int kprobe_blacklist_seq_show(struct seq_file *m, void *v) > * If /proc/kallsyms is not showing kernel address, we won't > * show them here either. > */ > - if (!kallsyms_show_value(current_cred())) > + if (!kallsyms_show_value(m->file->f_cred)) > seq_printf(m, "0x%px-0x%px\t%ps\n", NULL, NULL, > (void *)ent->start_addr); > else > -- > 2.25.1 > -- Masami Hiramatsu