From patchwork Fri Oct 20 22:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31485rwb; Fri, 20 Oct 2023 15:28:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiHTq4/aQI2al9l+YXkwhHw+xha+VDvbb9zbsDEd2Xfkm4X89qZnBvsRzGjmnc7EIgAS+w X-Received: by 2002:a17:90b:33c3:b0:276:78f2:5d31 with SMTP id lk3-20020a17090b33c300b0027678f25d31mr4338098pjb.21.1697840907143; Fri, 20 Oct 2023 15:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840907; cv=none; d=google.com; s=arc-20160816; b=jVdgAMoJqbIookwu92Yt3cLDRifp+0TwZpd2dyfluxMGO1VTlvbq5w0QnbgdDVZGKa wdKQGgiBwymxTFB3XUhZN9cndrwhPFzVe5tWYQSP6EfoRCIjmGyLahIuUpjzqdJtCsNQ hP/YFTHp1M4BDOf8hCyQjxjxUdtI2v5koG62Agryqw763aY5xrnUpQRvPxCC7GSgqTSL lcS8lGuICzQSHleEkDnd+4Wf0WM3Gng26Qll4vpPltRtzU++IE6jPthsB20amw1oGOrM JtE6p69Ehogixra/aEoiN6UQPiVU1E/2MNCC86qobd21YjYBCN1bjVyF0nmACjWYwgG5 /x9g== 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=EQ4n0X3d+vxyb4mCeVAi9KsWxoMIvelJMSb0dI81Tgk=; fh=gMGlXfW0sFvPOGM7+SFGc+r78hw7cjZmPhaXb0CQaX0=; b=auq50C41GIH7VrSabpIBCu+srFEUqtZhYpjkOUQkcBhRWBt8oyZoC/dD4cH31c/Ob7 hOJVEfKQxf0TPqyCpEQYiAkVcfBetwxB6IYXsUtypzXIZ0trWRZUgwbFGQGLuOGpkKh6 Qxt4Cv2ZVKfiu4HgJP2UycgPERXqpKiPJ/j9B0S6qLaNLbBxp6qPwG96tIlG2qZN9etU SR2tJKsTcwbFZvDhzj4TwzwgAFV393jKBGani/hipeAcXFLNE/fAJYSP3owEc+TMNnSy cfTSh3+zUtrpbVxzWA7IUVB3FiurYpKwqw/jG0GAVWxxdkZ2m9Y1w4ADdtnUHlq8/CPW dFHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id 17-20020a17090a035100b00277453e82fesi2576503pjf.87.2023.10.20.15.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (Postfix) with ESMTP id E3C188434ADE; Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230188AbjJTW1q (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229928AbjJTW1n (ORCPT ); Fri, 20 Oct 2023 18:27:43 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 997021A3 for ; Fri, 20 Oct 2023 15:27:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 400ABC433C9; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxxz-00AQYF-2w; Fri, 20 Oct 2023 18:27:39 -0400 Message-ID: <20231020222739.722516559@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:14 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Kees Cook , Nathan Chancellor Subject: [for-next][PATCH 1/6] eventfs: Use ERR_CAST() in eventfs_create_events_dir() References: <20231020222713.074741220@goodmis.org> 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.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 (morse.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315226907966879 X-GMAIL-MSGID: 1780315226907966879 From: Nathan Chancellor When building with clang and CONFIG_RANDSTRUCT_FULL=y, there is an error due to a cast in eventfs_create_events_dir(): fs/tracefs/event_inode.c:734:10: error: casting from randomized structure pointer type 'struct dentry *' to 'struct eventfs_inode *' 734 | return (struct eventfs_inode *)dentry; | ^ 1 error generated. Use the ERR_CAST() function to resolve the error, as it was designed for this exact situation (casting an error pointer to another type). Link: https://lore.kernel.org/linux-trace-kernel/20231018-ftrace-fix-clang-randstruct-v1-1-338cb214abfb@kernel.org Closes: https://github.com/ClangBuiltLinux/linux/issues/1947 Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Reviewed-by: Kees Cook Signed-off-by: Nathan Chancellor Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 1ccd100bc565..9f19b6608954 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -731,7 +731,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry return NULL; if (IS_ERR(dentry)) - return (struct eventfs_inode *)dentry; + return ERR_CAST(dentry); ei = kzalloc(sizeof(*ei), GFP_KERNEL); if (!ei) From patchwork Fri Oct 20 22:27:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31551rwb; Fri, 20 Oct 2023 15:28:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5Q1TemEOIlzE3zrv5xoSZezDXjJGySP7Nqgnjgf9xilWllSfDtLYhwBXUxJAGndzvrYST X-Received: by 2002:a17:902:dac5:b0:1ca:117b:455b with SMTP id q5-20020a170902dac500b001ca117b455bmr4188046plx.46.1697840918517; Fri, 20 Oct 2023 15:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840918; cv=none; d=google.com; s=arc-20160816; b=Vs/C8vBEpO8hyLQkV6S3hBMEdnjYsVsd/bVnRdou+rJnh2fbenL+WpQ2Dgwf3CRm+b qpaAioUzV3JrqZzYe7vpyzTluaRR7YxGV36qRiq0xy+zG92NP7B/jauZzPR3gSvm4FBU pKAxEfo3EjWaL+N24u0I53iJpyguBWtPim8NC0OVuDnOSKIBOcaErwF+fQenQeTPrS5o 45yFd2SnIy4o7oWWMAk2yZ76who+6Z1QkF+5e147r7n8eX4cE6DqzgR1elgpXSXFLRdu Q6n2AUsfm/G2K+TbzkJKi1RfCMQ7bn+2GR90dkRhyBJMrVh/mV8IhVJocB9H+N/iqBco jlOA== 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=m1qmjoQCLWy2jqCWChqn4zj743wmiY8A7hTasoPC+os=; fh=+Er+2MNaOgAwTiZYyyyh845Me8tKBUGSLNj4Y4cCEtM=; b=RtlozdrBORszufUCvHRH1nCCYwGAevYE/EB7II4FWfSt9RzLhp4wZZpTiK5mWhH1rx UzTYY0AWI2o/5yHSQFP2gY/CQ1qJc8Ztc29gAssW0tO1epTQ5baqOJidRnKMsMeKyMXY m2HWxqe0hvZ9bOn+p/Rc0NOhGxniRnKKkTh/J35qj+bzSDfthAk6tCCaDVhlanMOpDkg bgUoWyx1Vs+samF7n36jwCRXcFoTSba2o1RBc4gI5N20oeOpoGS1lT4U7OGh79v/AC8q M8oKlJeDFysWGSgKKEvt35FspfWo+KolVDQeBLhH8wFzGmlWmqsUIdptmstcPrDE3MyC 2wxQ== 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:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id v5-20020a170902b7c500b001ca122454a9si2480475plz.563.2023.10.20.15.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id E8DA9805F850; Fri, 20 Oct 2023 15:28:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230252AbjJTW1t (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229990AbjJTW1n (ORCPT ); Fri, 20 Oct 2023 18:27:43 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0D5DD5A for ; Fri, 20 Oct 2023 15:27:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E5E9C433CA; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQYo-0V; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222739.960696059@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:15 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Julia Lawall Subject: [for-next][PATCH 2/6] eventfs: Fix failure path in eventfs_create_events_dir() References: <20231020222713.074741220@goodmis.org> 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315238502027752 X-GMAIL-MSGID: 1780315238502027752 From: "Steven Rostedt (Google)" The failure path of allocating ei goes to a path that dereferences ei. Add another label that skips over the ei dereferences to do the rest of the clean up. Link: https://lore.kernel.org/all/70e7bace-561c-95f-1117-706c2c220bc@inria.fr/ Link: https://lore.kernel.org/linux-trace-kernel/20231019204132.6662fef0@gandalf.local.home Cc: Masami Hiramatsu Cc: Mark Rutland Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Reported-by: Julia Lawall Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 9f19b6608954..1885f1f1f339 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -735,7 +735,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry ei = kzalloc(sizeof(*ei), GFP_KERNEL); if (!ei) - goto fail; + goto fail_ei; inode = tracefs_get_inode(dentry->d_sb); if (unlikely(!inode)) @@ -781,6 +781,7 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry fail: kfree(ei->d_children); kfree(ei); + fail_ei: tracefs_failed_creating(dentry); return ERR_PTR(-ENOMEM); } From patchwork Fri Oct 20 22:27:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31530rwb; Fri, 20 Oct 2023 15:28:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IETCNKHZ1oMSESEJ4wQOYt2+F50i5r2SrelWU2trYD46CRSAjJ85GUE2dm2xpsCVqiSsdX/ X-Received: by 2002:a05:6358:894:b0:166:f0b4:12f8 with SMTP id m20-20020a056358089400b00166f0b412f8mr3462334rwj.6.1697840914988; Fri, 20 Oct 2023 15:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840914; cv=none; d=google.com; s=arc-20160816; b=gnicN5341zSL8ban11Wvrge+3TjwF1dXWh6d+5RnT+Xle8mUBRjK90gghr6FPyq9D9 EmmgEhaZhY4LMYOTPXCMSkFfpxmk+jNSGJ2Fu42lSnxqocJrOfYRTM4rTvNXdCBdLn38 0lxaM/7zLXkJwi+2GCCuPzm5Ujr7h3oaB9QbDuwM6oJ2YALxEvhr/EEe7xyWACRwTfYX cZEvkd40hmh/XXDJIZx3Bpzvto4NdPM0n+VcF5N4oMPayTTXl7XN9/sCUb5IQ6JN45pP ozzSbmB0ZnlUqn4dCsVynYYwJOyNmBYA5FBH7cw+TuK88bWGSGfWGa2NP5hLsoNZA1t2 QpFg== 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=hV8N9+lSdlYCDnLLLZ9ZVga1QHh4E9/7reD9MHw1FRY=; fh=RQrGvwfrMayID2oIEPOHlHTthL8sR0Wq1VaiExoEcZQ=; b=Oz3BmfpEGGmzCT41ANPGHN3LnWsfUrUxO66d1a81YdKThrhhJtgqLD7rO5lx7UKCw1 jrI1F/AKQ1A4ZNwabQI+SAO/OHZlidBlG+SzXvUT+nNE2t8MkyXv8cnKTcV1UOxvey6A OEn78nCRMblK0DuDMvboWbgZjCEyRFHZc1Vo7lyu/dfQnB9K9XHU2f+p1K8mVX4mHoov Zaqr5xJDItsiBT4a9l/f8/H/Mc/WwxRUWknZO72odSvop3mmz3j0uoTfaz9h04jlKsXs k06a53EQ0m0lE+WaLRpUrdpoT4uX1sZ1MyLDMTMZO1no61p9WEYA76cLG3Zl/mxHBLlo dvjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id v22-20020a63f216000000b0059f0cebd046si2526192pgh.729.2023.10.20.15.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id 7445F820365C; Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230295AbjJTW1x (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230021AbjJTW1o (ORCPT ); Fri, 20 Oct 2023 18:27:44 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5A6FD5B for ; Fri, 20 Oct 2023 15:27:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64385C433CC; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQZM-1C; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222740.185464260@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:16 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Dan Carpenter Subject: [for-next][PATCH 3/6] tracing: Fix a NULL vs IS_ERR() bug in event_subsystem_dir() References: <20231020222713.074741220@goodmis.org> 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:15 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315235159484490 X-GMAIL-MSGID: 1780315235159484490 From: Dan Carpenter The eventfs_create_dir() function returns error pointers, it never returns NULL. Update the check to reflect that. Link: https://lore.kernel.org/linux-trace-kernel/ff641474-84e2-46a7-9d7a-62b251a1050c@moroto.mountain Cc: Masami Hiramatsu Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Signed-off-by: Dan Carpenter Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index db46d2116500..f9e3e24d8796 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2354,7 +2354,7 @@ event_subsystem_dir(struct trace_array *tr, const char *name, nr_entries = ARRAY_SIZE(system_entries); ei = eventfs_create_dir(name, parent, system_entries, nr_entries, dir); - if (!ei) { + if (IS_ERR(ei)) { pr_warn("Failed to create system directory %s\n", name); __put_system(system); goto out_free; From patchwork Fri Oct 20 22:27:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156358 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31581rwb; Fri, 20 Oct 2023 15:28:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwx41sX+M2moYbAMQxS23X4JisEmsuVdycEtfy62fz3sL/NDv/3iGBM5OHvfzUmxiqT1ou X-Received: by 2002:a05:6a21:3d8b:b0:136:faec:a7dc with SMTP id bj11-20020a056a213d8b00b00136faeca7dcmr3104405pzc.11.1697840925187; Fri, 20 Oct 2023 15:28:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840925; cv=none; d=google.com; s=arc-20160816; b=DC1aJTl6TFLhFWmMTedddzcz0n40e7+Vn5HUrGA/ooD/Pfg8yhOPMWHjEPWqcaw/9Q cqL9SsBM236KSc+lQ+ZosO8hSkE68yUPIOxO5/cOsQUYmsbUJ45bQerhd66p5chphoa5 pecilSjUtyER7mmu7GfGWfzmOudL5wH2cW3PULq1DVjzhnZknXt9nU5WJ8G0jC1xJ3Ll Duzwb8XqU7nT/CQFiBJzgA2qLQfA6nxWDOvUc1E8VJQBf2tItQjPTQw117IzWvrZ2nCJ eXlzmd/PMYoFK0dBa3Nj+tt1FGiv+5Il1qv1GJ2iJxkKxaF1DCaI4qPoPezaozPYC3XO YjYQ== 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=4p0DyGHKy6qap35CzeLBkx4Bq80liW3aEqY8koHPg4c=; fh=1vJhkDnmwXFkNs+8Na14vHaZYZ3WrIlbI0KUsLq+FQE=; b=tEiMEny3AlE9AYZgpSFR7Dc6cRtQp2V3DxiqAXtx+zzri3BiuCSOkUXWx/QlBswQwa oCjPxWvS62AXLQBlM7XhRsNfm157iGH6o3PMUFzPnaXd9YZ8H/xPDV99T4yuSmaxeJ5i mnGUVaYTWle9kwYwAHT7DJnbMOIIkUiM2qJG6+olcgEvQu17bP+0ymfTwtJhanRitmw1 NoO+Raey/HiwXZIJO0++CmT5X7cUxpJ2tmj2xxNNg/ewQXHGEA5+Ro7s8YoyhtyfKz/G XwrLmoWEZ/26UYue6R4QHClJQeLKUtWa1X3OI8+XnOCKjEO86y7jBGKMXa+iiGjF77JM tsPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id bv67-20020a632e46000000b005aca8ed90c3si2456232pgb.271.2023.10.20.15.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 70C7783B008C; Fri, 20 Oct 2023 15:28:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231893AbjJTW2C (ORCPT + 26 others); Fri, 20 Oct 2023 18:28:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjJTW1r (ORCPT ); Fri, 20 Oct 2023 18:27:47 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A4E9D65 for ; Fri, 20 Oct 2023 15:27:42 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5231C43397; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQZu-1v; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222740.410840872@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:17 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Abaci Robot , Jiapeng Chong Subject: [for-next][PATCH 4/6] tracefs/eventfs: Modify mismatched function name References: <20231020222713.074741220@goodmis.org> 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315245806559694 X-GMAIL-MSGID: 1780315245806559694 From: Jiapeng Chong No functional modification involved. fs/tracefs/event_inode.c:864: warning: expecting prototype for eventfs_remove(). Prototype was for eventfs_remove_dir() instead. Link: https://lore.kernel.org/linux-trace-kernel/20231019031353.73846-1-jiapeng.chong@linux.alibaba.com Reported-by: Abaci Robot Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=6939 Signed-off-by: Jiapeng Chong Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 1885f1f1f339..09ab93357957 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -856,7 +856,7 @@ static void unhook_dentry(struct dentry **dentry, struct dentry **list) } } /** - * eventfs_remove - remove eventfs dir or file from list + * eventfs_remove_dir - remove eventfs dir or file from list * @ei: eventfs_inode to be removed. * * This function acquire the eventfs_mutex lock and call eventfs_remove_rec() From patchwork Fri Oct 20 22:27:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31666rwb; Fri, 20 Oct 2023 15:28:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGR0k5AXmqn5EIEemWL7W+KwjNJwilMUIQ5X7g9rqBR5HUBjwBHTT++JgyICd8jKsE/n1pE X-Received: by 2002:a05:6a00:987:b0:6be:1f19:e604 with SMTP id u7-20020a056a00098700b006be1f19e604mr3641352pfg.21.1697840939027; Fri, 20 Oct 2023 15:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840939; cv=none; d=google.com; s=arc-20160816; b=ge5oLaIkEU6iZuvbFFHamiyczSz12ChFqdT7SDhO+mhT43YsiiC3oD4Y0HHTURUyBl Y35l4bh9VE1eFLv3TLXev4KSj+ugsSIpGRm94bjt6n4WK67+xp6fK0hdWXcdkAEpp39C 4X0kPRcz7fIz1ogy9kLSRto2F/dCxwZdHUmoa06rNCFGsYLjSU/ND+tUJhdcp9ptKOME DLTinFwFFuqMPMFwR3rkfbAYQP2qF7Y5K2PFKsK2gEXHPpTeypNXIisbyp5lyOKLxLXP AZ9ZM8D0XliasKp2fA9NvQnHw6VV0qblnvyxCC98eoIy3GOLN86f6ugc9jlDnOiArLAR mkAw== 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=4yofLjkthU/lP8ih4LXUpor00b3DM0HXPaMi4BTlC5Q=; fh=DdzWLHWaCQHOX7uFyUDW4JuFmvZbmJipxMH92QjIxp0=; b=LE77VsAaNarHE3ZYDX+/UghUV9bKCfWkLatOXvFTXeBcLTIhgIqKvPBzP3wUyDSLID gHjT7milTvPifzwpIiKQA+6UwmlZhKa72D5Jjiaq6cG6geTuvRikchlKPhj2NDd7T6+S Do+BYwbGNUer9INTbnoqQDqbhbNHjtGtAiwg6YjApFEEgk52je7g74M74ZbnrILMw+GN fvtAaeuvi2xc6A/Nj0/Hc7u6V5pKcjwvbeI7onX/UJXysC50/eUVOWE11DrLjqWXqsJn 5qI6tEYdRyDYJ9YZZHiEmCEQgZc6p3SAODXybus9Y7L2fdS+Zwoo+qJfCUk2oF3DEvsc koqQ== 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:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id x9-20020a056a00188900b006b7f2d74121si2831048pfh.212.2023.10.20.15.28.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 0B4C48374E77; Fri, 20 Oct 2023 15:28:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230320AbjJTW17 (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229473AbjJTW1p (ORCPT ); Fri, 20 Oct 2023 18:27:45 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3CEDD67 for ; Fri, 20 Oct 2023 15:27:42 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C610EC433C8; Fri, 20 Oct 2023 22:27:41 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy0-00AQaS-2e; Fri, 20 Oct 2023 18:27:40 -0400 Message-ID: <20231020222740.632819967@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:18 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Kees Cook , Justin Stitt , Kent Overstreet , Petr Mladek , Andy Shevchenko , Rasmus Villemoes , Sergey Senozhatsky , "Matthew Wilcox (Oracle)" , Christoph Hellwig , Greg Kroah-Hartman Subject: [for-next][PATCH 5/6] tracing: Move readpos from seq_buf to trace_seq References: <20231020222713.074741220@goodmis.org> 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Fri, 20 Oct 2023 15:28:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315260794496487 X-GMAIL-MSGID: 1780315260794496487 From: "Matthew Wilcox (Oracle)" To make seq_buf more lightweight as a string buf, move the readpos member from seq_buf to its container, trace_seq. That puts the responsibility of maintaining the readpos entirely in the tracing code. If some future users want to package up the readpos with a seq_buf, we can define a new struct then. Link: https://lore.kernel.org/linux-trace-kernel/20231020033545.2587554-2-willy@infradead.org Cc: Kees Cook Cc: Justin Stitt Cc: Kent Overstreet Cc: Petr Mladek Cc: Andy Shevchenko Cc: Rasmus Villemoes Cc: Sergey Senozhatsky Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Christoph Hellwig Acked-by: Greg Kroah-Hartman Signed-off-by: Steven Rostedt (Google) --- include/linux/seq_buf.h | 5 +---- include/linux/trace_seq.h | 2 ++ kernel/trace/trace.c | 10 +++++----- kernel/trace/trace_seq.c | 6 +++++- lib/seq_buf.c | 22 ++++++++++------------ 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h index 515d7fcb9634..a0fb013cebdf 100644 --- a/include/linux/seq_buf.h +++ b/include/linux/seq_buf.h @@ -14,19 +14,16 @@ * @buffer: pointer to the buffer * @size: size of the buffer * @len: the amount of data inside the buffer - * @readpos: The next position to read in the buffer. */ struct seq_buf { char *buffer; size_t size; size_t len; - loff_t readpos; }; static inline void seq_buf_clear(struct seq_buf *s) { s->len = 0; - s->readpos = 0; } static inline void @@ -143,7 +140,7 @@ extern __printf(2, 0) int seq_buf_vprintf(struct seq_buf *s, const char *fmt, va_list args); extern int seq_buf_print_seq(struct seq_file *m, struct seq_buf *s); extern int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, - int cnt); + size_t start, int cnt); extern int seq_buf_puts(struct seq_buf *s, const char *str); extern int seq_buf_putc(struct seq_buf *s, unsigned char c); extern int seq_buf_putmem(struct seq_buf *s, const void *mem, unsigned int len); diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h index 6be92bf559fe..3691e0e76a1a 100644 --- a/include/linux/trace_seq.h +++ b/include/linux/trace_seq.h @@ -14,6 +14,7 @@ struct trace_seq { char buffer[PAGE_SIZE]; struct seq_buf seq; + size_t readpos; int full; }; @@ -22,6 +23,7 @@ trace_seq_init(struct trace_seq *s) { seq_buf_init(&s->seq, s->buffer, PAGE_SIZE); s->full = 0; + s->readpos = 0; } /** diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 4383be8fa1b0..d629065c2383 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1731,15 +1731,15 @@ static ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt) { int len; - if (trace_seq_used(s) <= s->seq.readpos) + if (trace_seq_used(s) <= s->readpos) return -EBUSY; - len = trace_seq_used(s) - s->seq.readpos; + len = trace_seq_used(s) - s->readpos; if (cnt > len) cnt = len; - memcpy(buf, s->buffer + s->seq.readpos, cnt); + memcpy(buf, s->buffer + s->readpos, cnt); - s->seq.readpos += cnt; + s->readpos += cnt; return cnt; } @@ -7008,7 +7008,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, /* Now copy what we have to the user */ sret = trace_seq_to_user(&iter->seq, ubuf, cnt); - if (iter->seq.seq.readpos >= trace_seq_used(&iter->seq)) + if (iter->seq.readpos >= trace_seq_used(&iter->seq)) trace_seq_init(&iter->seq); /* diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c index bac06ee3b98b..7be97229ddf8 100644 --- a/kernel/trace/trace_seq.c +++ b/kernel/trace/trace_seq.c @@ -370,8 +370,12 @@ EXPORT_SYMBOL_GPL(trace_seq_path); */ int trace_seq_to_user(struct trace_seq *s, char __user *ubuf, int cnt) { + int ret; __trace_seq_init(s); - return seq_buf_to_user(&s->seq, ubuf, cnt); + ret = seq_buf_to_user(&s->seq, ubuf, s->readpos, cnt); + if (ret > 0) + s->readpos += ret; + return ret; } EXPORT_SYMBOL_GPL(trace_seq_to_user); diff --git a/lib/seq_buf.c b/lib/seq_buf.c index 45c450f423fa..b7477aefff53 100644 --- a/lib/seq_buf.c +++ b/lib/seq_buf.c @@ -324,23 +324,24 @@ int seq_buf_path(struct seq_buf *s, const struct path *path, const char *esc) * seq_buf_to_user - copy the sequence buffer to user space * @s: seq_buf descriptor * @ubuf: The userspace memory location to copy to + * @start: The first byte in the buffer to copy * @cnt: The amount to copy * * Copies the sequence buffer into the userspace memory pointed to - * by @ubuf. It starts from the last read position (@s->readpos) - * and writes up to @cnt characters or till it reaches the end of - * the content in the buffer (@s->len), which ever comes first. + * by @ubuf. It starts from @start and writes up to @cnt characters + * or until it reaches the end of the content in the buffer (@s->len), + * whichever comes first. * * On success, it returns a positive number of the number of bytes * it copied. * * On failure it returns -EBUSY if all of the content in the * sequence has been already read, which includes nothing in the - * sequence (@s->len == @s->readpos). + * sequence (@s->len == @start). * * Returns -EFAULT if the copy to userspace fails. */ -int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, int cnt) +int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, size_t start, int cnt) { int len; int ret; @@ -350,20 +351,17 @@ int seq_buf_to_user(struct seq_buf *s, char __user *ubuf, int cnt) len = seq_buf_used(s); - if (len <= s->readpos) + if (len <= start) return -EBUSY; - len -= s->readpos; + len -= start; if (cnt > len) cnt = len; - ret = copy_to_user(ubuf, s->buffer + s->readpos, cnt); + ret = copy_to_user(ubuf, s->buffer + start, cnt); if (ret == cnt) return -EFAULT; - cnt -= ret; - - s->readpos += cnt; - return cnt; + return cnt - ret; } /** From patchwork Fri Oct 20 22:27:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 156359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp31604rwb; Fri, 20 Oct 2023 15:28:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIbekNH/A2xhiJMJZuPay06BN/+EhxmDqJzh7uU2SD6oyQgrRqwbXCL3WmeCh+ks3gXsqa X-Received: by 2002:a05:6a00:180d:b0:6bd:b7c5:f777 with SMTP id y13-20020a056a00180d00b006bdb7c5f777mr3227382pfa.16.1697840930195; Fri, 20 Oct 2023 15:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697840930; cv=none; d=google.com; s=arc-20160816; b=dPbhfjEVd7Lqbpkx3Syrnc+CncgwNhzGfFKbuce5l8DhxRd6RlEK+GP0pVkOfzNOEx YK9DJoEnPbEgucL44S3dd+1c8VJRtdZ2we0J9P5amOrw9qbN0QCkiJ82oc0kSxBrdiNs +PuCThrHgeAepqlgCYQxRDT/tDF/RkTF0mo66nCMGmOHpDzvpn2X/DZRhLzmsMye9juc gKKul468XZKrnIexmOiaDIwm+UipTIpQ1NVJhoRg6BeR59qQw9vHmj34S3+37nOVGFmT nks8rB5Dfdb+ubeVFHstM9k9HIytYmdK9PY8IHVikTPuTgN/NNdgY3YYl5oXcka25HgZ lxFw== 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=Be98MJPM5bDcnyIGI1xLuEAs41VxzEldtTAP8vbCE6U=; fh=FwUYGH9BDmS3HXbwPfn5ByBT0roRrTCEPhmCaCPPxPs=; b=ScVEnPX7zvX0cFzFlwkP393wPCHgxERh4C+kWMG7SdLYT4gslgrDtfYzGpDyn5mVNT zbsPzZQwWeIlteKhwVj2mBGbf5DPeJDTSgpiRNFM43ARM/fUmoI4oNgcxaHHIW9uqEno QHNIDjTefLTsp5T8X3Bhps82zDGoX7xZnI8qo2STK0w1Twt47FTV33ZjReWXaP8+8k6m GyeYxQdpk10rFE25WkAxLAOEB/TlJRwxD9svfYO2crfWyh7xkeCwXRNStQnAfOqZGY3u XRn/Mnnpu/iEczpgMmaDIlqb0/wU0q0EMWpwt9PmIO1SB+sh+VDUBT3FkLT664znW+tK 2AWw== 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 ka24-20020a056a00939800b0068bf645ac9bsi2793996pfb.238.2023.10.20.15.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 15:28:50 -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 9089182DB46A; Fri, 20 Oct 2023 15:28:47 -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 S230270AbjJTW14 (ORCPT + 26 others); Fri, 20 Oct 2023 18:27:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230117AbjJTW1o (ORCPT ); Fri, 20 Oct 2023 18:27:44 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E57C8D69 for ; Fri, 20 Oct 2023 15:27:42 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 013B3C4339A; Fri, 20 Oct 2023 22:27:42 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qtxy1-00AQb0-07; Fri, 20 Oct 2023 18:27:41 -0400 Message-ID: <20231020222740.846078267@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 20 Oct 2023 18:27:19 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Jonathan Corbet Subject: [for-next][PATCH 6/6] seq_buf: fix a misleading comment References: <20231020222713.074741220@goodmis.org> 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 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]); Fri, 20 Oct 2023 15:28:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780315250806354548 X-GMAIL-MSGID: 1780315250806354548 From: Jonathan Corbet The comment for seq_buf_has_overflowed() says that an overflow condition is marked by len == size, but that's not what the code is testing. Make the comment match reality. Link: https://lkml.kernel.org/r/87pm19kp0m.fsf@meer.lwn.net Fixes: 8cd709ae7658a ("tracing: Have seq_buf use full buffer") Signed-off-by: Jonathan Corbet Signed-off-by: Steven Rostedt (Google) --- include/linux/seq_buf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/seq_buf.h b/include/linux/seq_buf.h index a0fb013cebdf..8483e4b2d0d2 100644 --- a/include/linux/seq_buf.h +++ b/include/linux/seq_buf.h @@ -36,7 +36,7 @@ seq_buf_init(struct seq_buf *s, char *buf, unsigned int size) /* * seq_buf have a buffer that might overflow. When this happens - * the len and size are set to be equal. + * len is set to be greater than size. */ static inline bool seq_buf_has_overflowed(struct seq_buf *s)