From patchwork Fri Apr 21 23:32:47 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: 9693953 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 631D16038E for ; Fri, 21 Apr 2017 23:34:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 507E328687 for ; Fri, 21 Apr 2017 23:34:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 454BA28691; Fri, 21 Apr 2017 23:34:12 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 684EE28687 for ; Fri, 21 Apr 2017 23:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426704AbdDUXd6 (ORCPT ); Fri, 21 Apr 2017 19:33:58 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35978 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426670AbdDUXdE (ORCPT ); Fri, 21 Apr 2017 19:33:04 -0400 Received: by mail-wm0-f41.google.com with SMTP id o81so25767224wmb.1 for ; Fri, 21 Apr 2017 16:33:03 -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=/PLo1Iz/KmSus0jfZLSSDfQnhCO+xiwm40s/Vkm+xjk=; b=onG7U6jzYGaXd0qo/SCRj9tRcyAcma5m4sOm/wqSVp2/PYbc9UF9NoIKsRQZwyJJQ6 pquikP7CEXURU31YO4B7fKsHQ0C8S1Jo9HpuyXS/eUE0GqUTZ4S5yb2FA2kZuxnmaxTd 7x3TNPdNygJ+RzkSjy/cuvYrdp9UKSGTqzD514ymqAN1jFzRXDczHxjMBSkhJBRr+2YF qevcSHT2wbj2qfARVI4nSlBXTygzoebWQsqOXtatc01h8r5R9seuNcRxl7ELQDB0OWbg O2DTr/Xk5eDCTtDEAv7+mxINIvemtdjctCEmercDNItJKENaNi8iaHCa2cIzFPUiAAgh Qn+A== 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=/PLo1Iz/KmSus0jfZLSSDfQnhCO+xiwm40s/Vkm+xjk=; b=lMlicAdZPmx+RMsmTA5Fp8TI/Pb44HXO1KVE5P67XPj7DhnrY3lSQ/1eyy3oqJmewj sfPySG5W/+h202NzWOw9NeYbvPo8l2zTuDiPj/wDj2CJUv8hL4klSlepju5ojVn5haLl 9ij0PpZhx3GzhSlyF4L3dVtBgOWFH/BH2YqvXXz1w6RhWXoFBO6OqZLLhYBMcntrST2A 1PuYOcD85EkHc6jb1UBZ2d/6+9z1w34cT9UONH8Hbz5W5uvARWJdamTRDk4yagQ27vwH cmoRoYF9RHp6EoD4A4aM+q64umMY0zfwpYatN+WEHAqMaAbYeS/nw3KoPc2e7dg0Pph1 g+uA== X-Gm-Message-State: AN3rC/7zR4n/jEsFrMWNFigduCOiUTmYvrDW67DWKpXPMI9qkCEL+Uhi UMznoxIIedwgRQ== X-Received: by 10.80.195.133 with SMTP id h5mr77004edf.153.1492817582684; Fri, 21 Apr 2017 16:33:02 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id x2sm816935edb.49.2017.04.21.16.33.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Apr 2017 16:33:02 -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 3/5] lightnvm: pblk: fix memory leak on error path Date: Sat, 22 Apr 2017 01:32:47 +0200 Message-Id: <1492817569-13532-4-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492817569-13532-1-git-send-email-javier@cnexlabs.com> References: <1492817569-13532-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 When write recovery fails, Free memory for the recovery structure. Fixes: a4bd217b4326 "lightnvm: physical block device (pblk) target" Signed-off-by: Javier González Reviewed-by: Matias Bjørling --- drivers/lightnvm/pblk-write.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index 74f7413..a896190 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -142,6 +142,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) /* Logic error */ if (bit > c_ctx->nr_valid) { WARN_ONCE(1, "pblk: corrupted write request\n"); + mempool_free(recovery, pblk->rec_pool); goto out; } @@ -149,6 +150,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) entry = pblk_rb_sync_scan_entry(&pblk->rwb, &ppa); if (!entry) { pr_err("pblk: could not scan entry on write failure\n"); + mempool_free(recovery, pblk->rec_pool); goto out; } @@ -162,6 +164,7 @@ static void pblk_end_w_fail(struct pblk *pblk, struct nvm_rq *rqd) ret = pblk_recov_setup_rq(pblk, c_ctx, recovery, comp_bits, c_entries); if (ret) { pr_err("pblk: could not recover from write failure\n"); + mempool_free(recovery, pblk->rec_pool); goto out; }