From patchwork Mon Mar 1 16:10:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388672 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3551069jap; Mon, 1 Mar 2021 09:39:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxqXMky7tam/zetWsWVzl8kElunmD15CtdyHjVw7jSRxlkZNkJnSCX+7zfdw3Tz5GAl7HvA X-Received: by 2002:a17:906:b082:: with SMTP id x2mr16561974ejy.100.1614620376356; Mon, 01 Mar 2021 09:39:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614620376; cv=none; d=google.com; s=arc-20160816; b=qKU9PKyfm+gKOpRI0zahz9t13xZ/3Xu0anBkcbMxFhXX80186tc+rKK2YvH7RHfXX8 HNmI/ylnw8vyFTAhWRZN5ZgMYEo/BabQDToRJYHB+SW0jS3TV2t4lRansySfn4+/fsKp 4+lxZdFdZy6p/+FPgFh7ZNrFzZSfbE9RbKQ4aZB0Ds+vZTC5DA4NEF2EcG/8vpPdrOYz AcsbMqSWKJPEKoQtsDPgKEhQf7ef4X+7rMOwC/nkvJAckBkHz2D9cG1SX1RNSitMUj4/ NOvqXDbMTXVtw2L7K6IkDx7P0FSjpVak/J6RT7DxKJPfgvkpx3/+uwNdAABnxuzu/U9o vjhw== 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=osmdIZ6xeui6EJkpbCtaKDemzxlSTwYM1fEdMi/Z1L4=; b=CX3nFUZ1BosJcE7Q3yLlvPFUKt5LfEFlTTAv6ze4CFmvLLR7aUJdufVjVprDbEvmjh qiUb7lXpa3Re759BvC6eOAIRxYsjQbXXbxR7m1Ssz5HF4Bizw2Z2Z9k/7Nx/yHxK2VLh 9er1oGzfhPRHzb/MhKay/RXpfhOZ0sqQnVEPSnnZMmhlhy+ZPeAfiOtb0Mqisn4KO0iU T6kBLAJgpmMDzEiNBSU0kt4OEBP04o6k6bB/J7yPKiWDoWwMqELA4KtHb2PQA9/08feJ JVdsddtH5SsPAZyVwAhoBfqzPfpElKVhlUfReqhdeVzi0e3b6Mhf+G2Po/Ee+zEmUwg8 KvqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OZIycyi2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id kl4si11907958ejc.341.2021.03.01.09.39.36; Mon, 01 Mar 2021 09:39:36 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OZIycyi2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S238714AbhCARiL (ORCPT + 13 others); Mon, 1 Mar 2021 12:38:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:52092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237800AbhCAR3g (ORCPT ); Mon, 1 Mar 2021 12:29:36 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2D24E65093; Mon, 1 Mar 2021 16:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617536; bh=GowxoeeIByD1M0xcJ5/1xiC31yHkKPzkZjCUnkCyJps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OZIycyi2R6hOMVWBmDSy0zUuWinb5r7R+W+JOuEdHIBNk1/65Bp87/jml4bAo9Czl Co9c9lBCUUgMjNJLwIkY8xarkXOJjRoOSnr4A/rpaUb5x152VoIAtqEKIbgsdcF3Rf ytNUECRd6mcGX/WYS1JqOA9Q7Da0Gm1BQIhQ4nMM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manivannan Sadhasivam , Linus Walleij , Miquel Raynal , Sasha Levin Subject: [PATCH 5.4 109/340] mtd: parsers: afs: Fix freeing the part name memory in failure Date: Mon, 1 Mar 2021 17:10:53 +0100 Message-Id: <20210301161053.699206422@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Manivannan Sadhasivam [ Upstream commit 7b844cf445f0a7daa68be0ce71eb2c88d68b0c5d ] In the case of failure while parsing the partitions, the iterator should be pre decremented by one before starting to free the memory allocated by kstrdup(). Because in the failure case, kstrdup() will not succeed and thus no memory will be allocated for the current iteration. Fixes: 1fca1f6abb38 ("mtd: afs: simplify partition parsing") Signed-off-by: Manivannan Sadhasivam Reviewed-by: Linus Walleij Cc: Linus Walleij Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-5-manivannan.sadhasivam@linaro.org Signed-off-by: Sasha Levin --- drivers/mtd/parsers/afs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.27.0 diff --git a/drivers/mtd/parsers/afs.c b/drivers/mtd/parsers/afs.c index 752b6cf005f71..8fd61767af831 100644 --- a/drivers/mtd/parsers/afs.c +++ b/drivers/mtd/parsers/afs.c @@ -370,10 +370,8 @@ static int parse_afs_partitions(struct mtd_info *mtd, return i; out_free_parts: - while (i >= 0) { + while (--i >= 0) kfree(parts[i].name); - i--; - } kfree(parts); *pparts = NULL; return ret;