From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DF3414265 for ; Thu, 7 Sep 2023 20:06:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC2CFC433C8; Thu, 7 Sep 2023 20:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694117217; bh=aGFaMLfkMRJ7SCt/qgEcOhVxcqWwkhD5fl+QOo8pX6c=; h=From:To:Cc:Subject:Date:From; b=NSGK9GxC99lb1fCm53abw/ugjAiGfUzVkgh1H2gDxlNt59XI78LhIHaDts6yjizWu VGk9/Am1Ord7HyFB5wpYtcqRpppOsJW59vSSVParAycMlvB7HBqAC4/LKSYdQ8idB9 ekGo4vkbEdpc7pKu+9iThNHHbtqYrMsXqjTsq3Q60ohI+1N2wf33jWruTtst4uUgR/ H9VaABqW6ZzpDcNP1nXV+I5K/V+bdiCGRY1dm8rFPygescQKSEtoRFOjpI/VCEWVpX KhznkaLOOyYFewVvScU2h4irERiAV5iveb2rZyXAF9D6s4wMEkssqiFNd7ke8FhouQ FhhLCNZrgLJyQ== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: stable@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Djalal Harouni Subject: [PATCH bpf 1/2] bpf: Add override check to kprobe multi link attach Date: Thu, 7 Sep 2023 22:06:51 +0200 Message-ID: <20230907200652.926951-1-jolsa@kernel.org> X-Mailer: git-send-email 2.41.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Currently the multi_kprobe link attach does not check error injection list for programs with bpf_override_return helper and allows them to attach anywhere. Adding the missing check. Cc: stable@vger.kernel.org Fixes: 0dcac2725406 ("bpf: Add multi kprobe link") Signed-off-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index a7264b2c17ad..c1c1af63ced2 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2853,6 +2853,17 @@ static int get_modules_for_addrs(struct module ***mods, unsigned long *addrs, u3 return arr.mods_cnt; } +static int addrs_check_error_injection_list(unsigned long *addrs, u32 cnt) +{ + u32 i; + + for (i = 0; i < cnt; i++) { + if (!within_error_injection_list(addrs[i])) + return -EINVAL; + } + return 0; +} + int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) { struct bpf_kprobe_multi_link *link = NULL; @@ -2930,6 +2941,11 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr goto error; } + if (prog->kprobe_override && addrs_check_error_injection_list(addrs, cnt)) { + err = -EINVAL; + goto error; + } + link = kzalloc(sizeof(*link), GFP_KERNEL); if (!link) { err = -ENOMEM; -- 2.41.0