From patchwork Thu Jun 15 13:05: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: 108528 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp646560vqr; Thu, 15 Jun 2023 06:45:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4bXbNWxLldgh0PrBEU27cgh3dwPXqC+IFDahv3gxKPdqIN8uiF14fXblHPpxNO6od8pLWQ X-Received: by 2002:a05:6a20:3cac:b0:110:2064:ecb with SMTP id b44-20020a056a203cac00b0011020640ecbmr6146261pzj.15.1686836737338; Thu, 15 Jun 2023 06:45:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686836737; cv=none; d=google.com; s=arc-20160816; b=on1hdmumhgOBlFhQJoI/V3ij/KKqy6TiSBy3U8FKRtZiI1fudcjKIZfBPOFibp5GPI 0DxPyEvWq1aUMyKovyP+B6Vvp+c4h0rj9wDS/j3373WkpPwNoHJ8CaOHLhUoz5YCU/5W LGCjlRRnj2mxco2kuv0T1b/SvIIrW5XA7C4SlYu5GPvNZB5CphUhwBgJ4P3r1+WM8Uq0 eam1nVY3WYB25r5nNyJFnuX2KdQBr8mlqA+ewBp/DN17lez6dorBHkwHjdgtRsBM4bUC 3vnW1oGs3TDHfLYoufmeBAgOUt36Jot4DHlPl9GVI4tTo8Gnj+q5zmZ60EoNmq2SysVD uusQ== 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=1N3RS/e2XBWuYH4HxCG3tF7TxXYcwfnvAFSE3UzT3n8=; b=tKx7IaSsnisAUv29pl8Rh7Eqf21ZLTroCLJoyVn9rM1YuCtLs/KH9HRumkrwZ5IKJg AzH7SKY5GqZJKBL0wgkgBrfFchfk8ymIK1Tk2Kq5hAbrK1lYc12z4k2RXXlTASk26k7h bfqzUXM1MGKxL9NGGBnQUcEDbbYo4HTqWkvqsF96KKbz5S+zlF2DHLKY1xOeaFDnxTY4 Tt+dcSaFNjri5n+eumq0EQmQkfQxEUXO84r9UUkHEWx/I26IfZiIV/x3KcYSSFfLHQbH NZNL2OPn1Pqr7SwtiKFZqHnnhN/EJGEPCK2dOg600FGPLeX3z0Vqnl9uXKGrtBb+HaGV P7Cw== 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 f16-20020a633810000000b0054288b91d66si12902606pga.635.2023.06.15.06.45.23; Thu, 15 Jun 2023 06:45:37 -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 S1344217AbjFONfi (ORCPT + 99 others); Thu, 15 Jun 2023 09:35:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344485AbjFONfD (ORCPT ); Thu, 15 Jun 2023 09:35:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7D2430DE for ; Thu, 15 Jun 2023 06:34:18 -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 E038E63759 for ; Thu, 15 Jun 2023 13:34:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55D1BC433CB; Thu, 15 Jun 2023 13:34:16 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n79-000Tlr-0p; Thu, 15 Jun 2023 09:34:15 -0400 Message-ID: <20230615133415.070156632@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:33 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming , Beau Belgrave Subject: [for-linus][PATCH 02/15] tracing/user_events: Prevent same name but different args event 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?1768776518465373481?= X-GMAIL-MSGID: =?utf-8?q?1768776518465373481?= From: sunliming User processes register name_args for events. If the same name but different args event are registered. The trace outputs of second event are printed as the first event. This is incorrect. Return EADDRINUSE back to the user process if the same name but different args event has being registered. Link: https://lore.kernel.org/linux-trace-kernel/20230529032100.286534-1-sunliming@kylinos.cn Signed-off-by: sunliming Reviewed-by: Masami Hiramatsu (Google) Acked-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 36 +++++++++++++++---- .../selftests/user_events/ftrace_test.c | 6 ++++ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index dbb14705d0d3..37a38496a6be 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1786,6 +1786,8 @@ static int user_event_parse(struct user_event_group *group, char *name, int ret; u32 key; struct user_event *user; + int argc = 0; + char **argv; /* Prevent dyn_event from racing */ mutex_lock(&event_mutex); @@ -1793,13 +1795,35 @@ static int user_event_parse(struct user_event_group *group, char *name, mutex_unlock(&event_mutex); if (user) { - *newuser = user; - /* - * Name is allocated by caller, free it since it already exists. - * Caller only worries about failure cases for freeing. - */ - kfree(name); + if (args) { + argv = argv_split(GFP_KERNEL, args, &argc); + if (!argv) { + ret = -ENOMEM; + goto error; + } + + ret = user_fields_match(user, argc, (const char **)argv); + argv_free(argv); + + } else + ret = list_empty(&user->fields); + + if (ret) { + *newuser = user; + /* + * Name is allocated by caller, free it since it already exists. + * Caller only worries about failure cases for freeing. + */ + kfree(name); + } else { + ret = -EADDRINUSE; + goto error; + } + return 0; +error: + refcount_dec(&user->refcnt); + return ret; } user = kzalloc(sizeof(*user), GFP_KERNEL_ACCOUNT); diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 7c99cef94a65..6e8c4b47281c 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -228,6 +228,12 @@ TEST_F(user, register_events) { ASSERT_EQ(0, ioctl(self->data_fd, DIAG_IOCSREG, ®)); ASSERT_EQ(0, reg.write_index); + /* Multiple registers to same name but different args should fail */ + reg.enable_bit = 29; + reg.name_args = (__u64)"__test_event u32 field1;"; + ASSERT_EQ(-1, ioctl(self->data_fd, DIAG_IOCSREG, ®)); + ASSERT_EQ(EADDRINUSE, errno); + /* Ensure disabled */ self->enable_fd = open(enable_file, O_RDWR); ASSERT_NE(-1, self->enable_fd);