From patchwork Wed Dec 14 14:01:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 33220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp239771wrn; Wed, 14 Dec 2022 06:07:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf62NNrgzy+cXwlR/iUPh+0/XIi1EZhuCRCXJ+0j3Uo+FR2C4kTMRmIXmVz92dURoo0LiyjZ X-Received: by 2002:a17:906:49d2:b0:7b9:f9d8:9554 with SMTP id w18-20020a17090649d200b007b9f9d89554mr20812622ejv.40.1671026832794; Wed, 14 Dec 2022 06:07:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671026832; cv=none; d=google.com; s=arc-20160816; b=bk/mOCadTJ6z2islAawQZ1Ku6PsTG491SdP0gaN6pTt9Ckf7DC1JFrV0a9lufBAFhD DCqzbyN5T0+NNjpX7VvCm6IJx0omFvpvzf8S+FQL2wBNVWgMs17zxlrTBHysRwO7rPvd CfurIHchHGsg8YZJjZcfUjJlc1KmPlB/Th7tizrqQeAjajOS5Q+zU/uKWe/H4B3oo17m IvJsBDYwYM3DkEXG0g5ZJsyRgWTGbDNUcptv2e1NUqCwYSUhkdswwN6k0lWXAxNd9RqZ rSitnqJyc7/RuAdPPgftq8efwkFZbyWNJkwAJEX3wrvGQob+seE9dWxHumBGtp3npuLo 63Dg== 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=jgjIksaMbBhlkF9nmwlfU7lsJwjtrYU6z/xG4gWWNL4=; b=zmwILX5v6bibVGyhvAwApiZRFK0s17MncCsAAkwEFBhp7IwG/h3loN/4hkRZEms4vc EYEn4PokOVlsieGCvrQsDA3v+aGgje9GSb54SSy7TGy+obutAHNCjdonmrMhtrKHQM5q nzuOXtc13VGVkhnNspGavg+ewHxvgr9Uab1p7R0qzHlumQmuzElPKQJXPevN/Cv6PAyp ErYRxK3eYB8sgSY5rcmoANSrjYihMKmpdGd7GbdZ0V2qq3GmcqOz84EBKaDG5hbxK4kE 860mOSs85PCq5sK5bYPJOMuZhb9S7ftC8uh20d/KT4z1CgqBnElRlrac17LqZBJBSgNe aUGA== 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 jg15-20020a170907970f00b007c0bc4924cbsi11718947ejc.963.2022.12.14.06.06.44; Wed, 14 Dec 2022 06:07:12 -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 S238503AbiLNOC2 (ORCPT + 99 others); Wed, 14 Dec 2022 09:02:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238522AbiLNOCL (ORCPT ); Wed, 14 Dec 2022 09:02:11 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB6A1EE28; Wed, 14 Dec 2022 06:02:10 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 4308561A8B; Wed, 14 Dec 2022 14:02:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ACC10C433F1; Wed, 14 Dec 2022 14:02:09 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p5SKm-000gsr-2G; Wed, 14 Dec 2022 09:02:08 -0500 Message-ID: <20221214140208.571914729@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 14 Dec 2022 09:01:34 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , stable@vger.kernel.org, Yang Jihong Subject: [for-next][PATCH 1/8] tracing: Fix infinite loop in tracing_read_pipe on overflowed print_trace_line References: <20221214140133.608431204@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 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?1752198632060719816?= X-GMAIL-MSGID: =?utf-8?q?1752198632060719816?= From: Yang Jihong 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. Link: https://lkml.kernel.org/r/20221129113009.182425-1-yangjihong1@huawei.com Cc: Masami Hiramatsu Cc: stable@vger.kernel.org Fixes: 088b1e427dbba ("ftrace: pipe fixes") Signed-off-by: Yang Jihong Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 664619b3f1e1..548890c7c0f5 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6802,7 +6802,20 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, ret = print_trace_line(iter); if (ret == TRACE_TYPE_PARTIAL_LINE) { - /* don't print partial lines */ + /* + * If one print_trace_line() fills entire trace_seq in one shot, + * trace_seq_to_user() will returns -EBUSY because save_len == 0, + * In this case, we need to consume it, otherwise, loop will peek + * this event next time, resulting in an infinite loop. + */ + if (save_len == 0) { + iter->seq.full = 0; + trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n"); + trace_consume(iter); + break; + } + + /* In other cases, don't print partial lines */ iter->seq.seq.len = save_len; break; }