Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3516C636D7 for ; Tue, 21 Feb 2023 15:17:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233287AbjBUPRU (ORCPT ); Tue, 21 Feb 2023 10:17:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233175AbjBUPRU (ORCPT ); Tue, 21 Feb 2023 10:17:20 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD7D32A9AE for ; Tue, 21 Feb 2023 07:17:18 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id b12so18552446edd.4 for ; Tue, 21 Feb 2023 07:17:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=BirKcUPaoEZP4j3IE8EVYnH1uKMvuZFg7dvD3Be4BDU=; b=fI34mOjC6DMmYRHuupmT4xgPvMSnXy5IkyWG1U55l2KUgx/qF5Is6F5gjmT8Il+W2V kW32M4Q5iwjio7Cb+m/w001JYVhBr3h0nCxVGDhio0sFMnkk188LZ0pORg4h55rARU3Q Jj8kJWDJnrXCNPiZVZ7EeVyQ4af89Qwa6obm+a5nbKpkZgKuSmvycW7XbB+UUcbVUtTM Dg+d3e7Bg4mIV31LDBn+C09GxfwqNnG0xgkrZVOi4rV6iIwh6doUq8dvmMpfGv3/JhEO JFCPaQpkJs6f7lIp2gXhnDP5+SsalxgIS3kCQ5QuuD8vXBLJ30JjwGkIdDUFSjLWafCw nwXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BirKcUPaoEZP4j3IE8EVYnH1uKMvuZFg7dvD3Be4BDU=; b=eR6albL0QgJc8WeTk0T+lwzZnLynnXB3c1hzbVIxjxKOrWUDEHA4DXvu3yKuXN4xQH yUOZ0bswEBQUbYyHK+5dpRvkEoKqn2t0aTvTW/wUVcJE8fsW+vGVKvsa7OAld34QelTa 6tDOHwJltIRYGmXGHB7MbAsXN9CBBA+5R2gB6xjT5TjmY9aFw+Y3p8x0cHlq0BBlZjiS Miw8dBJK2UKQ+AGc8lCxpUnoiyTA2Qun19AFP5BijawEV3eRaIvINpd8qxFLygS5MExo uhu+itBvp58Nr17mw8L+RRIrNux5Eu2OeLXaruJqXjOvm7YZiKFXCfJAnn7fisLMb/Om 6/qg== X-Gm-Message-State: AO0yUKXNOMi69vDMQKA/kZZjT3CGClHkAi08897OLxavWP7HQnHsxdhU aRD/rWQ6ToeDYzxdfnWGHL4= X-Google-Smtp-Source: AK7set9yjD9uS05uGrq/seHm8QtQLUcjbbI467I2nGuySn3mJavYipO9qlDTfnSOdeTI3lkrA+1v/w== X-Received: by 2002:a17:906:261b:b0:8aa:c105:f0bf with SMTP id h27-20020a170906261b00b008aac105f0bfmr13459538ejc.17.1676992637271; Tue, 21 Feb 2023 07:17:17 -0800 (PST) Received: from krava (2001-1ae9-1c2-4c00-726e-c10f-8833-ff22.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:726e:c10f:8833:ff22]) by smtp.gmail.com with ESMTPSA id g13-20020a056402090d00b004acbda55f6bsm1374576edz.27.2023.02.21.07.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 07:17:16 -0800 (PST) From: Jiri Olsa X-Google-Original-From: Jiri Olsa Date: Tue, 21 Feb 2023 16:17:14 +0100 To: Viktor Malik Cc: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Luis Chamberlain Subject: Re: [PATCH bpf-next v7 1/2] bpf: Fix attaching fentry/fexit/fmod_ret/lsm to modules Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Mon, Feb 20, 2023 at 11:42:52AM +0100, Viktor Malik wrote: SNIP > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > index 388245e8826e..6da830df3ea5 100644 > --- a/kernel/bpf/verifier.c > +++ b/kernel/bpf/verifier.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include "../module/internal.h" > > #include "disasm.h" > > @@ -16868,6 +16869,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, > const char *tname; > struct btf *btf; > long addr = 0; > + struct module *mod = NULL; > > if (!btf_id) { > bpf_log(log, "Tracing programs must provide btf_id\n"); > @@ -17041,7 +17043,15 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, > else > addr = (long) tgt_prog->aux->func[subprog]->bpf_func; > } else { > - addr = kallsyms_lookup_name(tname); > + if (btf_is_module(btf)) { > + mod = btf_try_get_module(btf); > + if (mod) > + addr = find_kallsyms_symbol_value(mod, tname); > + else > + addr = 0; > + } else { > + addr = kallsyms_lookup_name(tname); > + } there are some error paths below this point which I think we could hit also for module id/address, so we need to put the mod ref also there's bpf_trampoline_link_cgroup_shim caller of bpf_check_attach_target, but I'm not sure that could endup with id/address in module code jirka > if (!addr) { > bpf_log(log, > "The address of function %s cannot be found\n", > @@ -17105,6 +17115,7 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, > tgt_info->tgt_addr = addr; > tgt_info->tgt_name = tname; > tgt_info->tgt_type = t; > + tgt_info->tgt_mod = mod; > return 0; > } > > @@ -17184,6 +17195,7 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) > /* store info about the attachment target that will be used later */ > prog->aux->attach_func_proto = tgt_info.tgt_type; > prog->aux->attach_func_name = tgt_info.tgt_name; > + prog->aux->mod = tgt_info.tgt_mod; > > if (tgt_prog) { > prog->aux->saved_dst_prog_type = tgt_prog->type; > diff --git a/kernel/module/internal.h b/kernel/module/internal.h > index 2e2bf236f558..5cb103a46018 100644 > --- a/kernel/module/internal.h > +++ b/kernel/module/internal.h > @@ -256,6 +256,11 @@ static inline bool sect_empty(const Elf_Shdr *sect) > static inline void init_build_id(struct module *mod, const struct load_info *info) { } > static inline void layout_symtab(struct module *mod, struct load_info *info) { } > static inline void add_kallsyms(struct module *mod, const struct load_info *info) { } > +static inline unsigned long find_kallsyms_symbol_value(struct module *mod > + const char *name) > +{ > + return 0; > +} > #endif /* CONFIG_KALLSYMS */ > > #ifdef CONFIG_SYSFS > -- > 2.39.1 >