From patchwork Wed Jun 28 11:53:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 13295626 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 6E9EAEB64D7 for ; Wed, 28 Jun 2023 11:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231654AbjF1Lxw (ORCPT ); Wed, 28 Jun 2023 07:53:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231579AbjF1Lxn (ORCPT ); Wed, 28 Jun 2023 07:53:43 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36CD730C0; Wed, 28 Jun 2023 04:53:42 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-666edfc50deso640260b3a.0; Wed, 28 Jun 2023 04:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687953221; x=1690545221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jD54nl0tOaqxtRArUwGCrqE7+SLaOuUCTBVw8Pj94ZQ=; b=Ck/Oyqucls5A2gz6ohWfwj3yUV74SNLKfFiqCy0xl+x2opGjfXkCPiK8Jess2jsUoq Qll9g3GIGJfSkDTXiidt9DDXJKM6EQv4EuiXjQv+DDZ8rcror7R4OjvUTw8e+EW18Pqj T3prp0A+iiiBs7BfmfNRANdVrTsPLBGlR7VKE+ZZEbLWXpJGOup/Z7o6c9Spo3PhyaCS OHLqAOeBqAKDhIJgZNjUUD7dwHNfE0rBe/XEa75lYyBK/i+t/eJmMup5BIcYXN81LLkK Hz53chHSQOt5FjNjCRscRNqIbK4OMI6DUf+KUR7hzsE6TSSDoOdcxRBWP9vJRm0dibde IM6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687953221; x=1690545221; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jD54nl0tOaqxtRArUwGCrqE7+SLaOuUCTBVw8Pj94ZQ=; b=KfCCKz/HQq3hyBizadgnG3RLJ4/6FU2KDhObqwfWwKgUgoG/AkmOnX9ixTgrsu/bLg N4buURtdltELOlKnEndnp0NSvgGE4/7JEJ21BOnXzigwsqxuT3dSEdlDHNttWe5J7auM s5v0mnROjFaYj127S1BMEzsp5y3PnXozyFc5rrid2Q3QvEqRh8bn7vonli7ZZ9TNQ0Ly 0zv7staRYqCBXXaF1IpvSCx040FC9u0shv/F7y60le1gez2c3tqH7eDiSJKVOOdmv3uN h9Qn8I7ICHUqbPnHzwfnraY5LWL87L9ELkQhxw36ZbCN9YTDyI7zeApgohUkfnwrHz/l cotg== X-Gm-Message-State: AC+VfDz/oj0hAorGFuzBRbo5IrxHfXP4UueGdK7AI0jASjSSohvZ9opM zxX7EW3hPKGBQOF8AutI7wQw42cEgTRk3JSV X-Google-Smtp-Source: ACHHUZ6dOWYrmqWXX+3dceqgNI13RhFyDhA2sVh82e9Dy0bRaGjxkY9G4PK/+CpiRe3BWBK/l10Olg== X-Received: by 2002:a17:90a:c56:b0:260:ba1e:9590 with SMTP id u22-20020a17090a0c5600b00260ba1e9590mr1500061pje.3.1687953221615; Wed, 28 Jun 2023 04:53:41 -0700 (PDT) Received: from vultr.guest ([2001:19f0:ac02:b79:5400:4ff:fe7d:3e26]) by smtp.gmail.com with ESMTPSA id n91-20020a17090a5ae400b002471deb13fcsm8000504pji.6.2023.06.28.04.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 04:53:41 -0700 (PDT) From: Yafang Shao To: ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, quentin@isovalent.com, rostedt@goodmis.org, mhiramat@kernel.org Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH v6 bpf-next 04/11] bpf: Protect probed address based on kptr_restrict setting Date: Wed, 28 Jun 2023 11:53:22 +0000 Message-Id: <20230628115329.248450-5-laoar.shao@gmail.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20230628115329.248450-1-laoar.shao@gmail.com> References: <20230628115329.248450-1-laoar.shao@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-kernel@vger.kernel.org The probed address can be accessed by userspace through querying the task file descriptor (fd). However, it is crucial to adhere to the kptr_restrict setting and refrain from exposing the address if it is not permitted. Signed-off-by: Yafang Shao --- kernel/trace/trace_kprobe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 59cda19a9033..e4554dbfd113 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -1551,7 +1551,10 @@ int bpf_get_kprobe_info(const struct perf_event *event, u32 *fd_type, } else { *symbol = NULL; *probe_offset = 0; - *probe_addr = (unsigned long)tk->rp.kp.addr; + if (kallsyms_show_value(current_cred())) + *probe_addr = (unsigned long)tk->rp.kp.addr; + else + *probe_addr = 0; } return 0; }