From patchwork Mon Mar 1 16:07:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 388719 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp3629058jap; Mon, 1 Mar 2021 11:25:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxKp4u9MDMNXy4ZSipKxUTfzWHECBLd6ygpXrdFrRkOZJcQ1epnDDn4WZyp8mSjZJCVswTd X-Received: by 2002:a17:906:1d55:: with SMTP id o21mr17434935ejh.485.1614626734567; Mon, 01 Mar 2021 11:25:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614626734; cv=none; d=google.com; s=arc-20160816; b=ctVdL7c5Qm9KmJ67a2sBKj5AIMLAAUKiP5PpV+p22RBA8M1LnRWvNjh6R/X5fyAiXr ploSv0pdjtUKfnVyQsvnywDdaGwXY5mWJV/hIFemQ8ngBvXO48KHkBenVo2JZLkixqGM e8WEQV74FOUAO2Ui8vcbuYI3YKtmH28Pl7A2mdaQBLy6me3AU1VF4nVK9riXAH+HhWcQ /0vkD1QAhI/lB8neVp8tiB6v4bbcb9/rCZjMHOk0xh/2K1Bt5BxY9sNQH5Gc3k00TAz4 TypwFEAwd15ZskiJSdYZ7ee0D92lMFxyFbwHm2mIQOSThntvT6hBUdyTH1lvc8U9zsWH BW6g== 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=2qVV/tF98xnG3QToxmWLBn5dtZ8RgeYp5KaXSmM4u+4=; b=V4K0RN6M5fett5fb2hdaW8N12wEKS625aEGVvkG0C089CZ9t+5goY5IPNns4WngIMy wVO1Vu9sgJKVXVmrW33s/OpqDJG2MMn26AoAO6O3978Aj0slmQKBr4tqiF0/cc5x0OsL z3Ovd0bbbZ7gAmeyV8fMONYJPLrDYvBBYzdhd8vYOgVBQf5Fq8xP1kSvW1RskdFYYzO+ 848L1r8SowfB/i+LxTcNf1S/5ksrq8YhuydiVzbgYYsUHOzja1+jeT0UITp0AHRGwcJc kVnKsqu+9tQ1Lnfu+4183/0k909hajbnoJaKnUx3fjAJxu98qQal5QmYkStNwNCugU8X xhRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gL43F+2v; 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 j3si11914162ejc.508.2021.03.01.11.25.34; Mon, 01 Mar 2021 11:25:34 -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=gL43F+2v; 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 S232143AbhCATZH (ORCPT + 13 others); Mon, 1 Mar 2021 14:25:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:43898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235779AbhCATSy (ORCPT ); Mon, 1 Mar 2021 14:18:54 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EC4AC651B1; Mon, 1 Mar 2021 17:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614618768; bh=gbpTDs9dPGrfRvSfxK5g4DorA6fv3N4bKFCME0f10GQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gL43F+2vmKBzMTd4ph/KRXWdnI9dUTJ1ItnCOOILu0yvs36ZMY36EPzKDuRqxdbW1 NSYOfN7uTueUbiUcjF5mB3AtYhTJ+3553j5l/31L02P4KyYJu9qxtRSvUgjG9gGWP4 9tOtZ4vOOQqh0ocA2rau5Src0F3F1qN/VbdbJOV4= 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.10 210/663] mtd: parsers: afs: Fix freeing the part name memory in failure Date: Mon, 1 Mar 2021 17:07:38 +0100 Message-Id: <20210301161152.178092648@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161141.760350206@linuxfoundation.org> References: <20210301161141.760350206@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 980e332bdac48..26116694c821b 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;