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 1E72DEB64DD for ; Thu, 29 Jun 2023 19:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232783AbjF2TBu (ORCPT ); Thu, 29 Jun 2023 15:01:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232821AbjF2TBQ (ORCPT ); Thu, 29 Jun 2023 15:01:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1ECF3593; Thu, 29 Jun 2023 12:01:13 -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 EAACF61575; Thu, 29 Jun 2023 19:01:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FA70C433C9; Thu, 29 Jun 2023 19:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688065271; bh=bqydMEeG0Xm6PkNRJNTSzNvr4tSuM+az5ZB4GfP+xew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hdc3NMfdQP1a9RSmIRQY8BuJY8w6Tma8eDEbmH5vDixPdlF9xgjy8VT5pFqTSv5+R bWmjIk7yEtZcRgwESGkemZUDpXbEW2f1YHEaJ6ZSJZo25a6V3Q9gO4c//IpTUlDASG c+I6EBgOVKv4fRRBdGCgC1Kl8DSTCyynNvqbnXTJ3n8Ev3sQfCthuHrTFdpQUefeuM +AHcAKQ7pVPcnyzJr3aV9LvNxnfItK+doIIyH4gvgpLrPOIy7aOBs8Wek1HdqjWogO 6c+yNCbtPNSEEMStOTDocYimTg7x54duPuuCrJsdVE9e9k9NPDULxINaTUoRY/Ub2C F6E7u8oxb7GSg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: sunliming , Masami Hiramatsu , Steven Rostedt , Sasha Levin , linux-trace-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 04/17] tracing/user_events: Handle matching arguments that is null from dyn_events Date: Thu, 29 Jun 2023 15:00:33 -0400 Message-Id: <20230629190049.907558-4-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230629190049.907558-1-sashal@kernel.org> References: <20230629190049.907558-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.3.9 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: sunliming [ Upstream commit cfac4ed7279d056df6167bd665e460787dc9e0c4 ] When A registering user event from dyn_events has no argments, it will pass the matching check, regardless of whether there is a user event with the same name and arguments. Add the matching check when the arguments of registering user event is null. Link: https://lore.kernel.org/linux-trace-kernel/20230529065110.303440-1-sunliming@kylinos.cn Signed-off-by: sunliming Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace_events_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 774d146c2c2ca..ad64da21c34aa 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1232,6 +1232,8 @@ static bool user_event_match(const char *system, const char *event, if (match && argc > 0) match = user_fields_match(user, argc, argv); + else if (match && argc == 0) + match = list_empty(&user->fields); return match; } -- 2.39.2