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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE81C54EBD for ; Mon, 9 Jan 2023 14:37:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229491AbjAIOh0 (ORCPT ); Mon, 9 Jan 2023 09:37:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60272 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbjAIOhZ (ORCPT ); Mon, 9 Jan 2023 09:37:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6EE717E10 for ; Mon, 9 Jan 2023 06:37:24 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 6315FB80D6C for ; Mon, 9 Jan 2023 14:37:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 063A3C433EF; Mon, 9 Jan 2023 14:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673275041; bh=XE/PEzVrg9yIYZ3VljbH0cX51kS2FBzumyZK9keXFaw=; h=From:To:Cc:Subject:Date:From; b=PPa5p/OupanJjWXgiVUeSo9TTaI5kPKzMaQ6u1cGf3y4N2nTELPBgIgF1f4IUqdy/ R2ijQWOSrkBB2+0J1ZNEQQeELS8xmtEEOmJmW2sUML8t4dZYuUxrlO8NGPqBOL/bGf ZvZb2xnQmQPucpKmelC2tLak4B/AbNt6K11dQyCeUviCHIQtEJfexnyAkWNAtS/uzQ BQf8hz9Q4MCJjfwh/6Z3cK2KXJCxYXCZo81cHNmuKJPNNZFPPQ5Xj4shG/nKSrREFc /0Jgw9rK033GhLJ07vLK7nldYZ4pMexGb+QNxlfYCYRnXUvunN7BbmD058xoi46ae4 xoS/qKMCw2DHQ== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo Subject: [PATCH bpf-next] bpf: Do not allow to load sleepable BPF_TRACE_RAW_TP program Date: Mon, 9 Jan 2023 15:37:16 +0100 Message-Id: <20230109143716.2332415-1-jolsa@kernel.org> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Currently we allow to load any tracing program as sleepable, but BPF_TRACE_RAW_TP can't sleep. Making the check explicit for tracing programs attach types, so sleepable BPF_TRACE_RAW_TP will fail to load. Updating the verifier error to mention iter programs as well. Signed-off-by: Jiri Olsa --- kernel/bpf/verifier.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index fa4c911603e9..121a64ee841a 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -16743,6 +16743,18 @@ BTF_ID(func, rcu_read_unlock_strict) #endif BTF_SET_END(btf_id_deny) +static int can_be_sleepable(struct bpf_prog *prog) +{ + if (prog->type == BPF_PROG_TYPE_TRACING) { + return prog->expected_attach_type == BPF_TRACE_FENTRY || + prog->expected_attach_type == BPF_TRACE_FEXIT || + prog->expected_attach_type == BPF_MODIFY_RETURN || + prog->expected_attach_type == BPF_TRACE_ITER; + } + return prog->type == BPF_PROG_TYPE_LSM || + prog->type == BPF_PROG_TYPE_KPROBE; +} + static int check_attach_btf_id(struct bpf_verifier_env *env) { struct bpf_prog *prog = env->prog; @@ -16761,9 +16773,8 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) return -EINVAL; } - if (prog->aux->sleepable && prog->type != BPF_PROG_TYPE_TRACING && - prog->type != BPF_PROG_TYPE_LSM && prog->type != BPF_PROG_TYPE_KPROBE) { - verbose(env, "Only fentry/fexit/fmod_ret, lsm, and kprobe/uprobe programs can be sleepable\n"); + if (prog->aux->sleepable && !can_be_sleepable(prog)) { + verbose(env, "Only fentry/fexit/fmod_ret, lsm, iter and kprobe/uprobe programs can be sleepable\n"); return -EINVAL; } -- 2.39.0