Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2288291iof; Wed, 8 Jun 2022 01:30:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHz2pVD89wz9aan6BIaW329p0q6oGbEaQbHV8M/lAgqxBf1kIvQ503Bh+wQRawY6KEhazo X-Received: by 2002:a17:90b:38c4:b0:1e6:89f9:73da with SMTP id nn4-20020a17090b38c400b001e689f973damr33892967pjb.220.1654677042784; Wed, 08 Jun 2022 01:30:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654677042; cv=none; d=google.com; s=arc-20160816; b=MfQXY44yEu2zfcE/xQXGYNiHnEbjJ4+4LK2hmY6aZd0ndqzAvcw1DUIMFiXHYEMhGS 9gtgqmirieueCDDwwViritN8ikOVRmEeDspv96BjFXHUBa/5RYXlr3KrTDaB1dOKUe36 eOAmhaQxaTCHTPRp9PY7XmmVPyGfxV86daPacqVa/lbFuviZ/o3o7Z2p6BSVvXcWMZpt nkfZXT1c/vaNBdEafLgr/mMYiEDnhGPI4aXcTw628asK5bxdj8FxUJn6cZUBQXa7Mpgh N0vOyaNapJ4xNliwgn2zx/E1QS1gScgEIhWPXkFHx6JHs5oEWB/JA3q5GSUTJXvXYJxJ b0zw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q2/7uE8v8FyPDyctc08vmJG7E92qXWOvV2955Jz8jig=; b=WpbL3vPRworn3OqTV/O6/K9Xlm7dc0VAEhNIP6BafvpRrkA6D5uXvZV934/KV8Qlx4 mWhOc9ZM+M3Ugg8rVF97XOai9SsXCdNxxO9w8YdQj4rGenI6bILbACXLHAun3mqISxC0 WicplEYvL/ToXmApIbmaJoBZbyD4U9unCps4xUcdhGRD1+RSXiuZ95nb5GBD+3S37VkX cmm9wZfoeoh0KZJviv2ZWrK0zrEC1Q7OaQihlN+W354+3iOTFtbAOBgG0kX8Sj4C8lDx RWzgGIZVbBZ+0D+qOk/TNluldNNTRwjWj4WISJTJ+6F+Hz8kUld0NePcA+BxGY9+ErSg /hMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gtzJuhqW; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id 14-20020a63070e000000b003dbb0401e4bsi30594757pgh.62.2022.06.08.01.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 01:30:42 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gtzJuhqW; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 13FFC369FA; Wed, 8 Jun 2022 00:59:08 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348860AbiFGVq4 (ORCPT + 99 others); Tue, 7 Jun 2022 17:46:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378127AbiFGUv2 (ORCPT ); Tue, 7 Jun 2022 16:51:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 147251FE39B; Tue, 7 Jun 2022 11:41:46 -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 ams.source.kernel.org (Postfix) with ESMTPS id 30A28B82182; Tue, 7 Jun 2022 18:41:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C7A0C385A2; Tue, 7 Jun 2022 18:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627304; bh=PFB7LMWW2PhVhGHlYnGEb+7WfOIbTaZ+ZxhAhllowaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gtzJuhqWn0RI1K6kSLMSVzXlZCM25fQsQaMKwA3xDj0IjVEE0g5/9HG+eX63bLv8B cDqEmCPu38ovlPOibOTEQKuZBc4sVEUh/jGjmVPNdogCiBAcLFsNsaW06Qvf32JO83 e1vI/43gccWHxixUAdHRosinKoVV81x5QjJVsdzg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Baik Song An , Hong Yeon Kim , Taeung Song , linuxgeek@linuxgeek.io, Wonhyuk Yang , "Steven Rostedt (Google)" Subject: [PATCH 5.17 650/772] tracing: Fix return value of trace_pid_write() Date: Tue, 7 Jun 2022 19:04:02 +0200 Message-Id: <20220607165008.218851412@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Wonhyuk Yang commit b27f266f74fbda4ee36c2b2b04d15992860cf23b upstream. Setting set_event_pid with trailing whitespace lead to endless write system calls like below. $ strace echo "123 " > /sys/kernel/debug/tracing/set_event_pid execve("/usr/bin/echo", ["echo", "123 "], ...) = 0 ... write(1, "123 \n", 5) = 4 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 write(1, "\n", 1) = 0 .... This is because, the result of trace_get_user's are not returned when it read at least one pid. To fix it, update read variable even if parser->idx == 0. The result of applied patch is below. $ strace echo "123 " > /sys/kernel/debug/tracing/set_event_pid execve("/usr/bin/echo", ["echo", "123 "], ...) = 0 ... write(1, "123 \n", 5) = 5 close(1) = 0 Link: https://lkml.kernel.org/r/20220503050546.288911-1-vvghjk1234@gmail.com Cc: Ingo Molnar Cc: Baik Song An Cc: Hong Yeon Kim Cc: Taeung Song Cc: linuxgeek@linuxgeek.io Cc: stable@vger.kernel.org Fixes: 4909010788640 ("tracing: Add set_event_pid directory for future use") Signed-off-by: Wonhyuk Yang Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -711,13 +711,16 @@ int trace_pid_write(struct trace_pid_lis pos = 0; ret = trace_get_user(&parser, ubuf, cnt, &pos); - if (ret < 0 || !trace_parser_loaded(&parser)) + if (ret < 0) break; read += ret; ubuf += ret; cnt -= ret; + if (!trace_parser_loaded(&parser)) + break; + ret = -EINVAL; if (kstrtoul(parser.buffer, 0, &val)) break; @@ -743,7 +746,6 @@ int trace_pid_write(struct trace_pid_lis if (!nr_pids) { /* Cleared the list of pids */ trace_pid_list_free(pid_list); - read = ret; pid_list = NULL; }