From patchwork Tue Oct 31 19:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp457348vqg; Tue, 31 Oct 2023 12:10:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG0PMBcx1iipgI0rxLPBFhxpxC9n3M71yH3lOSiDcRzlYn/18h+8ZYF6KyA2pT13hPF9tcb X-Received: by 2002:a05:6a20:3d11:b0:17a:eff5:fbbe with SMTP id y17-20020a056a203d1100b0017aeff5fbbemr4882104pzi.8.1698779457931; Tue, 31 Oct 2023 12:10:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698779457; cv=none; d=google.com; s=arc-20160816; b=SKbSE8zj8VlyJXBMdo31au6/u0oKzYd9806p36+rYH5GqlmZFUNTWCbCE+UoV2tSaX z5PPxvYNzRYSRxHNKDgr06pZoSmeIRNt84N52KzC3C7VkV9R71IMX7Zmum37h5d13ffa qtzPQKaL/mENrWIGQA45sbOIazepGkqBfmfhZ22LCU/uI7CUpY5CeaU7Jh034PRFaSn7 cYM4ipZHFSRJwcOMMgLW6ruJAG6mS5lwRdSB5cDhTt4VYoivCa+hSfCIpW7pteGGvEmf Yz/PFFn5COo6tnZk8gHfjCiazjQg3P3fTJeZf8RFGe0jv2EmT5tsEmd4x8NQlfAlvXWS w94A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:subject:cc:to:from:date; bh=KHr0vBgQmGwQBxO9I9AntfoQU7KwTgQB+WssGzZWhYU=; fh=GwUA7iixakkO5NTXBBRh1SUU4bI3bHSxo/Z9KQ16JZ0=; b=IgV7vsH0a0Y1Y7+39AUXayTMThxRxhPpbA5hDbNk00TdzvOhbN12IZCKrO98Mkhxtm Ylnzbqdkvetg0NVTVK7nXoVeZwzKoR0MF3pPj3qlL//vRM8q1+5bp8UbFlmluwo0ZQUq escBZCFMzqmaZOOHdGWUe9QJN2QRAdUa+Me9a6hVX9Zu6zslqDr/O5Zw31XD3gVa4PCx lUr6IHkP1kYfJ/45TrmgEs+fM7tWhUi/WhAQeEWTMfI8i61KWzW/ho058/AFP0lqZfvQ dn8y5nQUay892UT3OmdEpPWU/5CIp5kc7Mb3EEB4ZEhfV53w3Hx7UCItnEiCrrjplfiV WtAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id t29-20020a056a00139d00b0068fdfe29f0asi4682pfg.88.2023.10.31.12.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 12:10:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 6D18D80293C9; Tue, 31 Oct 2023 12:10:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234271AbjJaTKk (ORCPT + 33 others); Tue, 31 Oct 2023 15:10:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231281AbjJaTKi (ORCPT ); Tue, 31 Oct 2023 15:10:38 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68298F4 for ; Tue, 31 Oct 2023 12:10:36 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75CE3C433C7; Tue, 31 Oct 2023 19:10:35 +0000 (UTC) Date: Tue, 31 Oct 2023 15:10:33 -0400 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: Masami Hiramatsu , Mark Rutland Subject: [PATCH] tracing: Have the user copy of synthetic event address use correct context Message-ID: <20231031151033.73c42e23@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 31 Oct 2023 12:10:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781299368739490220 X-GMAIL-MSGID: 1781299368739490220 From: "Steven Rostedt (Google)" A synthetic event is created by the synthetic event interface that can read both user or kernel address memory. In reality, it reads any arbitrary memory location from within the kernel. If the address space is in USER (where CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE is set) then it uses strncpy_from_user_nofault() to copy strings otherwise it uses strncpy_from_kernel_nofault(). But since both functions use the same variable there's no annotation to what that variable is (ie. __user). This makes sparse complain. Quiet sparse by typecasting the strncpy_from_user_nofault() variable to a __user pointer. Cc: stable@vger.kernel.org Fixes: 0934ae9977c2 ("tracing: Fix reading strings from synthetic events"); Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202311010013.fm8WTxa5-lkp@intel.com/ Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_synth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c index 14cb275a0bab..846e02c0fb59 100644 --- a/kernel/trace/trace_events_synth.c +++ b/kernel/trace/trace_events_synth.c @@ -452,7 +452,7 @@ static unsigned int trace_string(struct synth_trace_event *entry, #ifdef CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE if ((unsigned long)str_val < TASK_SIZE) - ret = strncpy_from_user_nofault(str_field, str_val, STR_VAR_LEN_MAX); + ret = strncpy_from_user_nofault(str_field, (const void __user *)str_val, STR_VAR_LEN_MAX); else #endif ret = strncpy_from_kernel_nofault(str_field, str_val, STR_VAR_LEN_MAX);