[for-next,04/12] tracing: Add NULL checks for buffer in ring_buffer_free_read_page()
Message ID | 20230125171339.079529885@goodmis.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp388370wrn; Wed, 25 Jan 2023 09:16:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGI0QJhsUW4702ANqXWm2e9Jz3i6ryhcK+Ji1tmNy3V8LLYS/iMsnwIiCnrwdnhrrUUSr6 X-Received: by 2002:a17:90b:3852:b0:228:d550:b04e with SMTP id nl18-20020a17090b385200b00228d550b04emr32822103pjb.49.1674666982741; Wed, 25 Jan 2023 09:16:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674666982; cv=none; d=google.com; s=arc-20160816; b=pHJFVNvPBxmR0HAkVf2Fa3FCn2Qz5gtz8NlD7OB/Nz2lS65b0AL5Pt/ECOb+9Kclep h0gIfkhjmW6+6pR29G1/Jv19JbSj2BgwPJPRHmcoPGf3tc/TUV0g8dg7e4QLzxu/7UMs oMKU5cjOpB5U1yIoUCIZUP9C99T6Sm933c2fgOxHgKMO20+ckpa3S6uyfmsig//FRypV zdZPrBxj9fyWv4/kCEysxl2fm+Ik6uqqTCNFIse+oj0T2OmmxaMtCwRTlCRrtfWFzfJX dIYd06z0yysPukf1+Xpf/ymOuVDLMuPvPZqO3If5Kx9/Q7YwIdMURA6HxsbGm+H06xfv JMnA== 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=qYCsWWlWTqSx1mFkFj2xdAMQ3q3E0GZoZIky6LdJiJ0=; b=Mm8kr1Ltd5oQMeZqXHqM64dkTDmGpfStoimSSs2Z/2BEQ1blQTXxmT/2WkPx0t/SIK yRX7zvoqgNHEFYwSsuJLoXCcSm9OxdRNAtKvXO55fj1V+KyVZclHgfFHKW+jkbL2rMw+ MlurXRAZ3mS8CBP0xNsMPE2HdK9H8EEOwdWN5GKESAqLse+rQSe8PSKnckETvspDC9MP 8Rx5juX/y/ukXM6DvH9IxQs4JSqWf5A8wXeBgZ0KDC4o3r2IMbmsZ3JG9sqIhgXGgIVt Vke39a9Nrz/VBRPM/d76hCXrwmz2T32ELeQmXwdRNfQgzJvIgzkI3PIRT0tj67KGas80 XJlg== 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 a2-20020a17090a854200b00229ecc9fabbsi8105pjw.32.2023.01.25.09.16.10; Wed, 25 Jan 2023 09:16:22 -0800 (PST) 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 S236166AbjAYROP (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Wed, 25 Jan 2023 12:14:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235528AbjAYRNy (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 25 Jan 2023 12:13:54 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD289C677 for <linux-kernel@vger.kernel.org>; Wed, 25 Jan 2023 09:13:43 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 60E3DB81B46 for <linux-kernel@vger.kernel.org>; Wed, 25 Jan 2023 17:13:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BA28C433A1; Wed, 25 Jan 2023 17:13:41 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from <rostedt@goodmis.org>) id 1pKjL9-004NrL-0q; Wed, 25 Jan 2023 12:13:39 -0500 Message-ID: <20230125171339.079529885@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Jan 2023 12:12:56 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, TOTE Robot <oslab@tsinghua.edu.cn>, Jia-Ju Bai <baijiaju1990@gmail.com> Subject: [for-next][PATCH 04/12] tracing: Add NULL checks for buffer in ring_buffer_free_read_page() References: <20230125171252.431857411@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756015606217503395?= X-GMAIL-MSGID: =?utf-8?q?1756015606217503395?= |
Series |
tracing: Updates for 6.3
|
|
Commit Message
Steven Rostedt
Jan. 25, 2023, 5:12 p.m. UTC
From: Jia-Ju Bai <baijiaju1990@gmail.com> In a previous commit 7433632c9ff6, buffer, buffer->buffers and buffer->buffers[cpu] in ring_buffer_wake_waiters() can be NULL, and thus the related checks are added. However, in the same call stack, these variables are also used in ring_buffer_free_read_page(): tracing_buffers_release() ring_buffer_wake_waiters(iter->array_buffer->buffer) cpu_buffer = buffer->buffers[cpu] -> Add checks by previous commit ring_buffer_free_read_page(iter->array_buffer->buffer) cpu_buffer = buffer->buffers[cpu] -> No check Thus, to avod possible null-pointer derefernces, the related checks should be added. These results are reported by a static tool designed by myself. Link: https://lkml.kernel.org/r/20230113125501.760324-1-baijiaju1990@gmail.com Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> --- kernel/trace/ring_buffer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index c366a0a9ddba..45d4a23d6044 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5626,11 +5626,16 @@ EXPORT_SYMBOL_GPL(ring_buffer_alloc_read_page); */ void ring_buffer_free_read_page(struct trace_buffer *buffer, int cpu, void *data) { - struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu]; + struct ring_buffer_per_cpu *cpu_buffer; struct buffer_data_page *bpage = data; struct page *page = virt_to_page(bpage); unsigned long flags; + if (!buffer || !buffer->buffers || !buffer->buffers[cpu]) + return; + + cpu_buffer = buffer->buffers[cpu]; + /* If the page is still in use someplace else, we can't reuse it */ if (page_ref_count(page) > 1) goto out;