From patchwork Thu Jun 15 13:05:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 108561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp683719vqr; Thu, 15 Jun 2023 07:36:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ687OE+vG78NlMD/cKhV3jjF/4vwHVeYrHtYk1ZR8vICMA0sWj0AIUNSa1BmWHLj0MdkVo2 X-Received: by 2002:aa7:cd16:0:b0:514:9929:1b01 with SMTP id b22-20020aa7cd16000000b0051499291b01mr12133647edw.8.1686839812600; Thu, 15 Jun 2023 07:36:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686839812; cv=none; d=google.com; s=arc-20160816; b=xrjs/rE/Xtl27VTWIwDhAH1bp+S/oixoId/mo6UO91OGDmlrw/JoEc9tGE5OyXaCyZ wu/5zMUq3fPs5f7rziSL0vg7sWko603yGIbQWmS6l9k+uDcy3PKR07fF77TtY95vbVMh gKTnqoEPIDMBHI52GCaF5amwV6bW8/566A1dI/j/bQNdXnG5JHzd+DrlsXCNlaPrjg5X j7euz15ofaqYoVcHIng3ZfxXp5y1AUyWuIcqhkc87UA1gNF0A1/rhC9NxcyYpjeH7zf3 q8FTz+Ij3pdyBJ60K3a1gSgSFC3yHOlj/BPJdvaP2KtlPnIX0PLs4p6fZPRKf8NTK2zH ooNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=4OWJSPdDkZrdOLP72RAYT13q+F04PiuHVFvP9v7huBo=; b=i6K/jgqzvltKqC0uvLuohV9Ppl/HoybJzDWmnwwUkvYtGqEsNL54a6zY26krBu+E7p 0yDQVvRAp5S/78AxUsFqcXxUeADvyTyzNs6ORx/ChBYuG4pPRKO0v9PRt1fo8SEm0mYy ApslVEmSRoC4xCnfmt7I4lL+tqHCG4d0pCyJv+kvL1S1eYAoGVPnBD9XMThpEyAedUf6 ohBfkR+8IQmzSX5IGLOT4/O77qTYh40SkNYwgt+WozCEdp78LbWLE68LRpQRUujma2Hz RESK1pFwrog5HwUEAe2YmO7795at8ZkOlr7i8YhAKn0DFkI9U0hvWspp0RgnH09Gn0uA SSvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e12-20020a50ec8c000000b00516b291217fsi10013179edr.0.2023.06.15.07.36.27; Thu, 15 Jun 2023 07:36:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238729AbjFONgz (ORCPT + 99 others); Thu, 15 Jun 2023 09:36:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344351AbjFONgU (ORCPT ); Thu, 15 Jun 2023 09:36:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56FD63582 for ; Thu, 15 Jun 2023 06:35:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7EFC6633FE for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB406C433CA; Thu, 15 Jun 2023 13:34:16 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n79-000TnV-2o; Thu, 15 Jun 2023 09:34:15 -0400 Message-ID: <20230615133415.683635706@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:36 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 05/15] tracing/user_events: Fix the incorrect trace record for empty arguments events References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768779742846963290?= X-GMAIL-MSGID: =?utf-8?q?1768779742846963290?= From: sunliming The user_events support events that has empty arguments. But the trace event is discarded and not really committed when the arguments is empty. Fix this by not attempting to copy in zero-length data. Link: https://lkml.kernel.org/r/20230606062027.1008398-2-sunliming@kylinos.cn Acked-by: Beau Belgrave Acked-by: Masami Hiramatsu (Google) Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index afe61dc86543..49914b6cb651 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1432,7 +1432,7 @@ static void user_event_ftrace(struct user_event *user, struct iov_iter *i, if (unlikely(!entry)) return; - if (unlikely(!copy_nofault(entry + 1, i->count, i))) + if (unlikely(i->count != 0 && !copy_nofault(entry + 1, i->count, i))) goto discard; if (!list_empty(&user->validators) && @@ -1473,7 +1473,7 @@ static void user_event_perf(struct user_event *user, struct iov_iter *i, perf_fetch_caller_regs(regs); - if (unlikely(!copy_nofault(perf_entry + 1, i->count, i))) + if (unlikely(i->count != 0 && !copy_nofault(perf_entry + 1, i->count, i))) goto discard; if (!list_empty(&user->validators) &&