From patchwork Wed Jul 21 03:50:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haoran Luo X-Patchwork-Id: 12390003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F7F8C07E9B for ; Wed, 21 Jul 2021 03:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12CDF6120A for ; Wed, 21 Jul 2021 03:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231363AbhGUDKa (ORCPT ); Tue, 20 Jul 2021 23:10:30 -0400 Received: from sender4-of-o54.zoho.com ([136.143.188.54]:21458 "EHLO sender4-of-o54.zoho.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbhGUDK3 (ORCPT ); Tue, 20 Jul 2021 23:10:29 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1626839435; cv=none; d=zohomail.com; s=zohoarc; b=bUP7iHcjmXLDoibmvfyEf4YJjSnKUlyUGPgXd+zv/AdU/hrnC5ttTfUdH1CMrmSVgux2qSt3O/PtX9pMW2p61No2x5DpYBd1Eb0u49YdpLfw9GsNkU1GbxzViUE2vBCMwhueM392Ld9diTztoa5aR3C8NcY/pvukxuRjUaX7CPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626839435; h=Content-Type:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=NzY0DmvGw4+fxiGSo3kV257zXzxxhOjC2fuSCDxasSE=; b=mc7O4xGhg0dZSepYVCR3xV2T+uCLUsJYV5gOuiJZ2eBlbSnPgS/6IglZecz5TSKCjTRgf4oxtbl2ICuaxl0WzITBtayMQDZmnzc7JARp089sNrPNKAFfrxvfbcZ3708SeyDP5bMhA4FclLhhdODPov/moqhrbJ1P/sqk7ruy6J8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass smtp.mailfrom=www@aegistudio.net; dmarc=pass header.from= Received: from aegistudio (125.119.77.199 [125.119.77.199]) by mx.zohomail.com with SMTPS id 1626839429681169.5721948143854; Tue, 20 Jul 2021 20:50:29 -0700 (PDT) Date: Wed, 21 Jul 2021 03:50:16 +0000 From: Haoran Luo To: rostedt@goodmis.org, mingo@redhat.com Cc: www@aegistudio.net, linux-trace-devel@vger.kernel.org, security@kernel.org Subject: [PATCH v2 1/1] tracing: fix bug in rb_per_cpu_empty() that might cause deadloop. Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org The "rb_per_cpu_empty()" misinterpret the condition (as not-empty) when "head_page" and "commit_page" of "struct ring_buffer_per_cpu" points to the same buffer page, whose "buffer_data_page" is empty and "read" field is non-zero. An error scenario could be constructed as followed (kernel perspective): 1. All pages in the buffer has been accessed by reader(s) so that all of them will have non-zero "read" field. 2. Read and clear all buffer pages so that "rb_num_of_entries()" will return 0 rendering there's no more data to read. It is also required that the "read_page", "commit_page" and "tail_page" points to the same page, while "head_page" is the next page of them. 3. Invoke "ring_buffer_lock_reserve()" with large enough "length" so that it shot pass the end of current tail buffer page. Now the "head_page", "commit_page" and "tail_page" points to the same page. 4. Discard current event with "ring_buffer_discard_commit()", so that "head_page", "commit_page" and "tail_page" points to a page whose buffer data page is now empty. When the error scenario has been constructed, "tracing_read_pipe" will be trapped inside a deadloop: "trace_empty()" returns 0 since "rb_per_cpu_empty()" returns 0 when it hits the CPU containing such constructed ring buffer. Then "trace_find_next_entry_inc()" always return NULL since "rb_num_of_entries()" reports there's no more entry to read. Finally "trace_seq_to_user()" returns "-EBUSY" spanking "tracing_read_pipe" back to the start of the "waitagain" loop. I've also written a proof-of-concept script to construct the scenario and trigger the bug automatically, you can use it to trace and validate my reasoning above: https://github.com/aegistudio/RingBufferDetonator.git Tests has been carried out on linux kernel 5.14-rc2 (2734d6c1b1a089fb593ef6a23d4b70903526fe0c), my fixed version of kernel (for testing whether my update fixes the bug) and some older kernels (for range of affected kernels). Test result is also attached to the proof-of-concept repository. Signed-off-by: Haoran Luo --- kernel/trace/ring_buffer.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index d1463eac11a3..fb9129029a32 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -3880,10 +3880,30 @@ static bool rb_per_cpu_empty(struct ring_buffer_per_cpu *cpu_buffer) if (unlikely(!head)) return true; - return reader->read == rb_page_commit(reader) && - (commit == reader || - (commit == head && - head->read == rb_page_commit(commit))); + /* Reader should exhaust content in reader page */ + if (reader->read != rb_page_commit(reader)) + return false; + + /* + * If writers are committing on the reader page, knowing all + * committed content has been read, the ring buffer is empty. + */ + if (commit == reader) + return true; + + /* + * If writers are committing on the head page, we just need + * to care about there're committed data, and the reader will + * swap reader page with head page when it is to read data. + */ + if (commit == head) + return rb_page_commit(commit) == 0; + + /* + * Writers are committing on page other than reader page and + * head page, there should always be content to read. + */ + return false; } /**