Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7394088rwi; Mon, 24 Oct 2022 14:05:12 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5L+0jtTY5+bqOHOBnbuPsuwKpOu/Uhuim95ScZmljGkS8wxhMx8TbVxjjsSkZjFcdl6CwC X-Received: by 2002:a17:907:31ca:b0:780:2170:e08c with SMTP id xf10-20020a17090731ca00b007802170e08cmr28774895ejb.145.1666645512043; Mon, 24 Oct 2022 14:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666645512; cv=none; d=google.com; s=arc-20160816; b=Fk/Njvcic1jUATXZDnOiY26rB4g+Vip2qOxZORwtcEp76z2Q1CS4nYtOiU3ksOaDyb CO3Kj6dJ884usEzQl+abwVJtW4ZlBdKETCu+bC90iV7UwmQwIBCwJy+FZEQ+t1bZ39tP Zr/n+VZ7qWco0D6EyjQeZLhyu8gINGRyvFe4WcC/pQoRU0WhJcrt/cSxsXrvNigX0p8+ i5KlngXH9atPiEbSTAseHvFdNyZXF8oUq16QJvXu0fQk7g9WSDlYVoGDDfq4TpqZS7kr D9viDw1NRnuiEj23OH1QYBnGRThLY+DGq1ly1Giy2s8VAvJX2QFCKa205c3X4wsYe0I/ A/QA== 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=IMQAa3OZbf3cU+QEkHBTI1ZbMSNud/dpkElMWQuQVH8=; b=Kq49xVd5fr2e6zuaTAbgiCZL+csyhJqp+kQ4JNtXCeW/oXx/3Z01ddZ0YmRfLG9i8v rEkRD0PdrlIMnMlQkzsuB03LF7IRDN5rLveQU3Li+kjYjiSKgbSaoZsdcwixypIyQ15g Gh0+UCmV9gqKreIddGfsvYwldUHzSeQnzF8TDYbNE4RzBD9IPsbUqMaHcdAVZbEfxCGC hwVZHOA0PmjV7ejqKeWVXhSTRNXwCKlIgEJQvDXcZUlfzQieX4a9hYpGndxRYYVd/iJo lH2pJ7l5Y77hdRiZ3i4t2g8TgiqpkD1D6Rse387XzjZrMzC3OVUdI1kZ3S7XIY3NML+X l6Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NVP+LNhQ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i15-20020a1709064fcf00b007a11c253eaasi747573ejw.809.2022.10.24.14.04.47; Mon, 24 Oct 2022 14:05:12 -0700 (PDT) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NVP+LNhQ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234224AbiJXUWf (ORCPT + 99 others); Mon, 24 Oct 2022 16:22:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232430AbiJXUVn (ORCPT ); Mon, 24 Oct 2022 16:21:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93C3F2AEB; Mon, 24 Oct 2022 11:38:04 -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 CB309B819D0; Mon, 24 Oct 2022 12:48:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B4BAC433C1; Mon, 24 Oct 2022 12:48:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615713; bh=1C7LZNF0bigHU323xk9H7sLgtgO6AK2mqdAho4OMV5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NVP+LNhQ1v17dbF6uY1z5LtbU8lPTD/xyFX6a4/EdtOHv/7fso4uqHPxkv4nk+7se Wf5Ngly+2rfjNEudsHQwK+7BuQCFKga79Xp834UzGAEeiBDusThWX/mDiTlEgZlTlb uNhPHxJW11nBrA9XkkFSpEY7SiqURc9CBwLAfhuE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Philipp Hortmann , Nam Cao , Sasha Levin Subject: [PATCH 5.15 328/530] staging: vt6655: fix some erroneous memory clean-up loops Date: Mon, 24 Oct 2022 13:31:12 +0200 Message-Id: <20221024113059.857992861@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 From: Nam Cao [ Upstream commit 2a2db520e3ca5aafba7c211abfd397666c9b5f9d ] In some initialization functions of this driver, memory is allocated with 'i' acting as an index variable and increasing from 0. The commit in "Fixes" introduces some clean-up codes in case of allocation failure, which free memory in reverse order with 'i' decreasing to 0. However, there are some problems: - The case i=0 is left out. Thus memory is leaked. - In case memory allocation fails right from the start, the memory freeing loops will start with i=-1 and invalid memory locations will be accessed. One of these loops has been fixed in commit c8ff91535880 ("staging: vt6655: fix potential memory leak"). Fix the remaining erroneous loops. Link: https://lore.kernel.org/linux-staging/Yx9H1zSpxmNqx6Xc@kadam/ Fixes: 5341ee0adb17 ("staging: vt6655: check for memory allocation failures") Reported-by: Dan Carpenter Tested-by: Philipp Hortmann Signed-off-by: Nam Cao Link: https://lore.kernel.org/r/20220912170429.29852-1-namcaov@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/vt6655/device_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d40c2ac14928..43e32360b6d9 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -565,7 +565,7 @@ static int device_init_rd0_ring(struct vnt_private *priv) kfree(desc->rd_info); err_free_desc: - while (--i) { + while (i--) { desc = &priv->aRD0Ring[i]; device_free_rx_buf(priv, desc); kfree(desc->rd_info); @@ -611,7 +611,7 @@ static int device_init_rd1_ring(struct vnt_private *priv) kfree(desc->rd_info); err_free_desc: - while (--i) { + while (i--) { desc = &priv->aRD1Ring[i]; device_free_rx_buf(priv, desc); kfree(desc->rd_info); @@ -716,7 +716,7 @@ static int device_init_td1_ring(struct vnt_private *priv) return 0; err_free_desc: - while (--i) { + while (i--) { desc = &priv->apTD1Rings[i]; kfree(desc->td_info); } -- 2.35.1