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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 35440CA9EC9 for ; Fri, 1 Nov 2019 03:55:46 +0000 (UTC) Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.kernel.org (Postfix) with SMTP id 8294F208CB for ; Fri, 1 Nov 2019 03:55:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DGvNnz+G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8294F208CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernel-hardening-return-17216-kernel-hardening=archiver.kernel.org@lists.openwall.com Received: (qmail 28188 invoked by uid 550); 1 Nov 2019 03:55:39 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Received: (qmail 28168 invoked from network); 1 Nov 2019 03:55:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=YiqPN73/qfLoGFPAaCK046WeDsIyHq2v7vxAoPf2Hxg=; b=DGvNnz+GeHeNfKZ6f7YLJzc3HABEEC30I8/B/IBZTbAoWTqYDEBA+PWjh7ne14xEji PE2FdEWksdLdMt2PKYPe0QSMEXkBcV49KFClWQ42/xFPVspDKk4kFzSNVn/0QiVKU0Hk Z4vIKb88INGDp/qLR22O2YTnuCwiKgJmJAvqs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=YiqPN73/qfLoGFPAaCK046WeDsIyHq2v7vxAoPf2Hxg=; b=PQ0SSy3xSebldE/jmd2KZlmQRUQ71O8sX6QjeGDg615EHBT4SGJFrsJy44DSyuR8Au uGHGN5lTGH3tiNFaGD1iyVzaMNQyWJtdGQO7URDMF3uFA9kmaZ5F5VJdoV9CvoVZr+pw WPFYjKSQWlYr2tfzKj9sHhWThPUPNTkXTGOHdKJY9Kp3tMbHKeFZJEFy7ysy2wc/D7xu 1CGlSZjWrP9HtB2WGrWovEIKRdc36kzj4KuZTvxL6x+oVDvPSe1aUqLpu6lti7rXpO3p 8c8Zmy20+RNBrXP/SjcNW3Gl8fVhM50qJAsiiqLU2gI7uxDUPawAGKepp59+WDvCeHav xOuQ== X-Gm-Message-State: APjAAAU6X96TEUGGg+TJ3mXQ8Lx1V0j9b2dmrCU3QXyKrzrez/aCHq2+ UeZY4QvKE2DMJj9ZfACSP40QBw== X-Google-Smtp-Source: APXvYqxD7MNY1jVYOjRfhYGo3ogwiiuExle/jPXGM0/pINsljnFcAcPtUzMI8R27pVSvoSzQhhOLJg== X-Received: by 2002:a17:90a:f310:: with SMTP id ca16mr5852511pjb.20.1572580527358; Thu, 31 Oct 2019 20:55:27 -0700 (PDT) Date: Thu, 31 Oct 2019 20:55:25 -0700 From: Kees Cook To: samitolvanen@google.com Cc: Will Deacon , Catalin Marinas , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Dave Martin , Laura Abbott , Mark Rutland , Nick Desaulniers , Jann Horn , Miguel Ojeda , Masahiro Yamada , clang-built-linux@googlegroups.com, kernel-hardening@lists.openwall.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 08/17] kprobes: fix compilation without CONFIG_KRETPROBES Message-ID: <201910312055.B551A6CB4@keescook> References: <20191018161033.261971-1-samitolvanen@google.com> <20191031164637.48901-1-samitolvanen@google.com> <20191031164637.48901-9-samitolvanen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191031164637.48901-9-samitolvanen@google.com> On Thu, Oct 31, 2019 at 09:46:28AM -0700, samitolvanen@google.com wrote: > kprobe_on_func_entry and arch_kprobe_on_func_entry need to be available > even if CONFIG_KRETPROBES is not selected. > > Signed-off-by: Sami Tolvanen FWIW: Reviewed-by: Kees Cook -Kees > Acked-by: Masami Hiramatsu > --- > kernel/kprobes.c | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/kernel/kprobes.c b/kernel/kprobes.c > index 53534aa258a6..b5e20a4669b8 100644 > --- a/kernel/kprobes.c > +++ b/kernel/kprobes.c > @@ -1829,6 +1829,25 @@ unsigned long __weak arch_deref_entry_point(void *entry) > return (unsigned long)entry; > } > > +bool __weak arch_kprobe_on_func_entry(unsigned long offset) > +{ > + return !offset; > +} > + > +bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset) > +{ > + kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset); > + > + if (IS_ERR(kp_addr)) > + return false; > + > + if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) || > + !arch_kprobe_on_func_entry(offset)) > + return false; > + > + return true; > +} > + > #ifdef CONFIG_KRETPROBES > /* > * This kprobe pre_handler is registered with every kretprobe. When probe > @@ -1885,25 +1904,6 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs) > } > NOKPROBE_SYMBOL(pre_handler_kretprobe); > > -bool __weak arch_kprobe_on_func_entry(unsigned long offset) > -{ > - return !offset; > -} > - > -bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset) > -{ > - kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset); > - > - if (IS_ERR(kp_addr)) > - return false; > - > - if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) || > - !arch_kprobe_on_func_entry(offset)) > - return false; > - > - return true; > -} > - > int register_kretprobe(struct kretprobe *rp) > { > int ret = 0; > -- > 2.24.0.rc0.303.g954a862665-goog > -- Kees Cook