From patchwork Mon Nov 14 02:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Jihong X-Patchwork-Id: 19524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1931430wru; Sun, 13 Nov 2022 18:54:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf7iSBfDlfi0eXWlMz6odI+Rvu9vIGOc8NzDcctFVsiLU7T84Df+h+cDVhCHcbZGBIzfJTkU X-Received: by 2002:aa7:c384:0:b0:461:5f19:61da with SMTP id k4-20020aa7c384000000b004615f1961damr9793964edq.34.1668394492336; Sun, 13 Nov 2022 18:54:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668394492; cv=none; d=google.com; s=arc-20160816; b=phn8p7fK9EbJiH4W8nX3d98zjClQfJTnmEetAQyXsNVYmwzcVnVmL5wUD9e9qAjNdp DDqbZ97mgPljOty5nV5a4O+AvfI/w/y31eyHvRryDB1Y0+dwF7BJs8nv/eWMF62nLPSq ZjApy0ciaZy386yHOumVFH+R+4EIWjOM/lcJu2B/RJjXdAa91aE90yiG9xI1ERtBFd0Z vyOD5g8yDnK1t1Skb9Pze4hxonfglFFRQ3JEsFFNMR1KQMeTu4jW01P7TkE64Gudo/Ee VWNEdgJGVFdNJ3oy5BqhShhHAJaOX+S+r3ZWDFLoydQL1yQGadshvlv8HBAwdM/hHdtF d7bA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=M6NhVjbalKg1NhuI+EvCeLZxeM6a0eXsfKIjzZyB1vE=; b=Y5615aMpw+ydtytmWHSHXE5CymFCgqwLLKZyWqyHm7EB3QBAOzFkeJgdXx+cUlinfx Yg08grYHwMo2vE2IGIzZkIo6kMqGFiRjDsfRR+4Q2onHwsHpUoja4Jl290V/C5K0qbth TW5OTnSffyLMpr8m2aehn5V1oRfqUSPz1BSUdzvKeRNUbTHyJw4fBtJQYsevoSX9A9w3 unabbxeDvbhI4MWVN4SnOdZNfL8CmmNO7tpRN0jJe+AH51zxy2gNqWVZAy1LzIWXARm8 WOa3P215E6px73aclTUXE52970fcuaKcK8sBPi2izxjslmbhEE4XzYg7qYeFQ7bwCX3/ rhcA== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020aa7d88d000000b00460ce6c3a1asi6552966edq.454.2022.11.13.18.54.28; Sun, 13 Nov 2022 18:54:52 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235551AbiKNCdB (ORCPT + 99 others); Sun, 13 Nov 2022 21:33:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbiKNCdA (ORCPT ); Sun, 13 Nov 2022 21:33:00 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53ACBDE94 for ; Sun, 13 Nov 2022 18:32:56 -0800 (PST) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N9YHp35T5zRp2l; Mon, 14 Nov 2022 10:32:38 +0800 (CST) Received: from kwepemm600003.china.huawei.com (7.193.23.202) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 10:32:54 +0800 Received: from ubuntu1804.huawei.com (10.67.174.61) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 10:32:54 +0800 From: Yang Jihong To: , , CC: Subject: [PATCH] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line Date: Mon, 14 Nov 2022 10:29:46 +0800 Message-ID: <20221114022946.66255-1-yangjihong1@huawei.com> X-Mailer: git-send-email 2.30.GIT MIME-Version: 1.0 X-Originating-IP: [10.67.174.61] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749438423005651943?= X-GMAIL-MSGID: =?utf-8?q?1749438423005651943?= print_trace_line may overflow seq_file buffer. If the event is not consumed, the while loop keeps peeking this event, causing a infinite loop. Signed-off-by: Yang Jihong --- kernel/trace/trace.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 47a44b055a1d..2a8d5c68c29b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6788,6 +6788,19 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, if (ret == TRACE_TYPE_PARTIAL_LINE) { /* don't print partial lines */ iter->seq.seq.len = save_len; + + /* + * If one trace_line of the tracer overflows seq_file + * buffer, trace_seq_to_user returns -EBUSY because + * nothing in the sequence (iter->seq.seq.len = \ + * iter->seq.seq.readpos = 0). + * In this case, we need to consume, otherwise, + * "while" will peek this event next time, resulting + * in an infinite loop. + */ + if (trace_seq_has_overflowed(&iter->seq)) + trace_consume(iter); + break; } if (ret != TRACE_TYPE_NO_CONSUME)