From patchwork Wed May 3 09:19:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9709051 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EA16760351 for ; Wed, 3 May 2017 09:19:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1C9F2860B for ; Wed, 3 May 2017 09:19:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6E5E28601; Wed, 3 May 2017 09:19:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7970E28601 for ; Wed, 3 May 2017 09:19:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752795AbdECJTk (ORCPT ); Wed, 3 May 2017 05:19:40 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38500 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752710AbdECJTb (ORCPT ); Wed, 3 May 2017 05:19:31 -0400 Received: by mail-wm0-f53.google.com with SMTP id r190so50217359wme.1 for ; Wed, 03 May 2017 02:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tpmSjD7e5sT+vRItgJ84jD9L6qxTvWNproUlnoiTADo=; b=Fw/x/IIPCEiSMVPgy4Jr/b1P5I1j6O81RiCX43sRETJXh1XGj02eysuMNRR3iCotL9 zS6x36o1MQG+KMdn3d67vY2FQxojfKB1a3otWzskHThKSCS/DYvBMwFuP5LGQdsRwLoW 1zKuug6BotK7r1goxkptRXvD4Es9FSsE0sB3ArZJE5mmnnexbGtosN3e09nNuODHmlga LinyxUCeZuxDoATp7Vs1jzmWIzqvJRxH5luNZ3O1ctQyu54hIYE/UYl+I7ke/TUvKIwh 7dqm460E2vouPdZsMlejAf1YkymCiB9BzIKJHag0w35yg9XIiucicHBjONYPCbpYenx4 Z4vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tpmSjD7e5sT+vRItgJ84jD9L6qxTvWNproUlnoiTADo=; b=lXgKkyxX7TNcnkyiNHkCUlnL47REScykFXq4QrOr8amWHVjzsMRjPlCaj684FbFf8S dZ68WK0pIuMeIJSmqd0xETZdAJwYOSBhhV0S6PYI+vf4/BwyZwPkNkHnpW4UG8JuQ1oC uWr7H0tQHAg6WJFmzXJhgS/PEaelRWpdnh7u3ErksaMvf/DQIbUt2xZIlL3BlohNrWda J5CQxlj2Sa2y2JSg3j3y2b1SYSHFMp0AgF0BILU8P6thbNId7Uryfosgiu6GqixN0dMl byhGuVrRqy13cWxsDzbing29XRYIVZzBVCntLNttjYQ7wO2ItSrsSsxQ+1eTtCJXTr9s C4FA== X-Gm-Message-State: AN3rC/5wpeEGVkvnv5J0WBpiK3vMmcByoWOFWdiDWIptoif+L+1v9SnK 19aPBQxjN8J/DQ== X-Received: by 10.80.166.33 with SMTP id d30mr25339007edc.80.1493803169710; Wed, 03 May 2017 02:19:29 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id x2sm10152667edb.49.2017.05.03.02.19.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 May 2017 02:19:29 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 2/2] lightnvm: fix bad back free on error path Date: Wed, 3 May 2017 11:19:05 +0200 Message-Id: <1493803145-18082-2-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493803145-18082-1-git-send-email-javier@cnexlabs.com> References: <1493803145-18082-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Free memory correctly when an allocation fails on a loop and we free backwards previously successful allocations. Signed-off-by: Javier González Reviewed-by: Matias Bjørling Reviewed-by: Christoph Hellwig --- drivers/lightnvm/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 54a06c3a2b8c..6a4aa608ad95 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -74,7 +74,7 @@ static int nvm_reserve_luns(struct nvm_dev *dev, int lun_begin, int lun_end) return 0; err: - while (--i > lun_begin) + while (--i >= lun_begin) clear_bit(i, dev->lun_map); return -EBUSY; @@ -211,7 +211,7 @@ static struct nvm_tgt_dev *nvm_create_tgt_dev(struct nvm_dev *dev, return tgt_dev; err_ch: - while (--i > 0) + while (--i >= 0) kfree(dev_map->chnls[i].lun_offs); kfree(luns); err_luns: