From patchwork Wed Apr 26 17:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 87908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp397648vqo; Wed, 26 Apr 2023 10:19:35 -0700 (PDT) X-Google-Smtp-Source: AKy350Y+qKijRtYhsfoGqKzkRmHWlo79wXZLy+Gxlq8396rbqz0Pd7Qj4DiZmz1ZobqhAieR2+/q X-Received: by 2002:a17:902:da90:b0:19e:500b:517a with SMTP id j16-20020a170902da9000b0019e500b517amr24466217plx.69.1682529575084; Wed, 26 Apr 2023 10:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682529575; cv=none; d=google.com; s=arc-20160816; b=g/wC6wsqC5A4DEu91LnH/Q2IBKXXvH83AeSIKdAk4XGelt8fgxxmpvlQZb1zcesrUQ E0u/8SPjc5118v9rKXzPjs/GOYxbi7Ir2yljeqTp6CnKjjEJJEoXOgzUzZjYfK3xmcOZ j6YMHnWLR2CxoAorAUeMcbGEcXA5cB2gXpHSUDU5qM6LjFGmsXUSbJ8ZQkQmZ4VuHDM1 Wizg9QvMlpDpSpc2xCiFN40Tq31VrvG5KLugLiG277RlymgMcVliQ9/JT906ieLAonYM 1GM8KvrfsU9mID4QZmre33qjBFcOWzOZ/XYa7dGjTQXpxGYSk277dyKxZeBRrMeHBALO lrRw== 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=VuWudvhM9VbqbCC2DYMfBoL7XmT+9n6ha3SGTwIqBLM=; b=t3gtlVXJrwoATnFhl4N95Ab1jMWRsL3vLYiEgxSIR1Ju5+4hUkQt/JG+xvwEb/Z/Ef tDe+JuYt/oRlxD8Yij7aP55igkG2We6B89V7TVCF964EerhA7svz490T+KUevJXpqgOA fjyisecY7ouKiX+TWJ1Z3Xbaxj7l0eYPNIGXAnCv4Jaog5BW2rEOimripCQi8DqN0oG4 Pg85puc5KjGUiSEaDyWn9+5qR2z4+UXX8blUBz86MgRHF+I/rwinhqTLPUsQA0PLLopb u0JaGedvsiUrF+3c32lVCupfHVcCmKFjHhurzh3QujTbDGyKCJFc7KGgI6lfAuLoPDBv g4cg== 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 w15-20020a1709026f0f00b001a95d336558si10940920plk.594.2023.04.26.10.19.19; Wed, 26 Apr 2023 10:19:35 -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 S234812AbjDZRR4 (ORCPT + 99 others); Wed, 26 Apr 2023 13:17:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232184AbjDZRRw (ORCPT ); Wed, 26 Apr 2023 13:17:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73486525D for ; Wed, 26 Apr 2023 10:17:51 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 08D1963049 for ; Wed, 26 Apr 2023 17:17:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 623EBC433D2; Wed, 26 Apr 2023 17:17:50 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1prim5-005KXf-1H; Wed, 26 Apr 2023 13:17:49 -0400 Message-ID: <20230426171749.213807197@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 26 Apr 2023 13:17:04 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Zheng Yejian Subject: [for-next][PATCH 01/11] ring-buffer: Clearly check null ptr returned by rb_set_head_page() References: <20230426171703.202523909@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?1764260131953486561?= X-GMAIL-MSGID: =?utf-8?q?1764260131953486561?= From: Zheng Yejian In error case, 'buffer_page' returned by rb_set_head_page() is NULL, currently check '&buffer_page->list' is equivalent to check 'buffer_page' due to 'list' is the first member of 'buffer_page', but suppose it is not some time, 'head_page' would be wild memory while check would be bypassed. Link: https://lore.kernel.org/linux-trace-kernel/20230414071729.57312-1-zhengyejian1@huawei.com Cc: Signed-off-by: Zheng Yejian Signed-off-by: Steven Rostedt (Google) --- kernel/trace/ring_buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 2d5c3caff32d..58be5b409f72 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -2054,10 +2054,11 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer) struct list_head *head_page, *prev_page, *r; struct list_head *last_page, *first_page; struct list_head *head_page_with_bit; + struct buffer_page *hpage = rb_set_head_page(cpu_buffer); - head_page = &rb_set_head_page(cpu_buffer)->list; - if (!head_page) + if (!hpage) break; + head_page = &hpage->list; prev_page = head_page->prev; first_page = pages->next;