From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A23D7C433FE for ; Mon, 31 Jan 2022 11:00:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358616AbiAaLAa (ORCPT ); Mon, 31 Jan 2022 06:00:30 -0500 Received: from dfw.source.kernel.org ([139.178.84.217]:60252 "EHLO dfw.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358321AbiAaK7u (ORCPT ); Mon, 31 Jan 2022 05:59:50 -0500 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 A77EF60B28; Mon, 31 Jan 2022 10:59:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 896DFC340E8; Mon, 31 Jan 2022 10:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643626790; bh=tnuOzLwaVZRpggTfGRr/SWIBGVOtaXSM75Dd1lEwC2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tcj4zETWXYQu04k28gPqsa1biTcmQYJYxhl6J6cpDaWy6oZXxx7PP0ZQpUmcU8Ux1 3iW8nNI583Ril7NWNhGlsgfajdA48q0BCW6pyTeCFm/4AayqOWVmzRGYKb44BWmhKc wqTtoQwCGyyim60pGaa5Rj3GBE+5YCuM0Plip4oo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Zanussi , "Steven Rostedt (Google)" Subject: [PATCH 5.4 08/64] tracing: Dont inc err_log entry count if entry allocation fails Date: Mon, 31 Jan 2022 11:55:53 +0100 Message-Id: <20220131105215.933572729@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220131105215.644174521@linuxfoundation.org> References: <20220131105215.644174521@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Zanussi commit 67ab5eb71b37b55f7c5522d080a1b42823351776 upstream. tr->n_err_log_entries should only be increased if entry allocation succeeds. Doing it when it fails won't cause any problems other than wasting an entry, but should be fixed anyway. Link: https://lkml.kernel.org/r/cad1ab28f75968db0f466925e7cba5970cec6c29.1643319703.git.zanussi@kernel.org Cc: stable@vger.kernel.org Fixes: 2f754e771b1a6 ("tracing: Don't inc err_log entry count if entry allocation fails") Signed-off-by: Tom Zanussi Signed-off-by: Steven Rostedt (Google) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6994,7 +6994,8 @@ static struct tracing_log_err *get_traci err = kzalloc(sizeof(*err), GFP_KERNEL); if (!err) err = ERR_PTR(-ENOMEM); - tr->n_err_log_entries++; + else + tr->n_err_log_entries++; return err; }