From patchwork Mon Nov 16 14:34:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 7627931 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 02EBFBF90C for ; Mon, 16 Nov 2015 14:39:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 28139205BE for ; Mon, 16 Nov 2015 14:39:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 524B920588 for ; Mon, 16 Nov 2015 14:39:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752906AbbKPOiy (ORCPT ); Mon, 16 Nov 2015 09:38:54 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:33508 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752689AbbKPOhh (ORCPT ); Mon, 16 Nov 2015 09:37:37 -0500 Received: by wmec201 with SMTP id c201so179707547wme.0 for ; Mon, 16 Nov 2015 06:37:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=FV9WpV2dHp8pQ5z7/sfEr2ezXDDwzYmYvbGlBjFp4hw=; b=M4iOVEqRBl9o0+3MvEbcxw7sZyiO1KSXj9p412ovxEK3HR5JhmYwKMGLg3digiNxfx 3tkVONNZPsJ6dn49KrXL0glm03powAZPKdYPv4F7pZZO/0J7WTh6e2XRrakxwl144lUj RCv25xYTAvZpbh2MZ1ZQd7s5o4hBt/1aVHtqA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=FV9WpV2dHp8pQ5z7/sfEr2ezXDDwzYmYvbGlBjFp4hw=; b=SiHx7vU8iTGntADzmolYKjlsORfAOd9RRNswh+4E1PruD5G4z15O52l5tKxRaLOa0c T5f1LL85Vndf1I7snxJZMKmhZGWLeou56wIxL8wWKm4pD8t04Yb+TeaerKkWKft9r/+g UhsXI4W9Jk1cIn7gVuEl9mePTMztrJYjSNrD1esrls2CeibdUDn7hSkjdG/W0UfDBnag I9RZ79u3BhRtFTRii3o2gz6LM1ZNgZnwvQmf4Xs5Jy4bbmtsEylREI5JdXJtgbmMuABP NL98okqqOrB0r4kxYtS3VEhBvxTNUfvEyagOoeiExoVvULbcwMqXEebpaLI1lvok/0DE NFTQ== X-Gm-Message-State: ALoCoQmjBheJm8n4kO/G6+tQ9RcbZ25/ZDFDQHGjbHKb6H4n1rdH4oaAJzxf5sNgawpV6Rjm1oOl X-Received: by 10.194.3.39 with SMTP id 7mr37357179wjz.20.1447684655707; Mon, 16 Nov 2015 06:37:35 -0800 (PST) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id u139sm18818127wmu.22.2015.11.16.06.37.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 Nov 2015 06:37:34 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, axboe@fb.com Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 09/13] lightnvm: prevent double free on init error Date: Mon, 16 Nov 2015 15:34:43 +0100 Message-Id: <1447684487-25539-10-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447684487-25539-1-git-send-email-m@bjorling.me> References: <1447684487-25539-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Both the nvm_register and nvm_init does a kfree(dev) on error. Make sure to only free it once. Signed-off-by: Matias Bjørling --- drivers/lightnvm/core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c index 40e6cfa..899f6b9 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -160,11 +160,6 @@ int nvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk) } EXPORT_SYMBOL(nvm_erase_blk); -static void nvm_core_free(struct nvm_dev *dev) -{ - kfree(dev); -} - static int nvm_core_init(struct nvm_dev *dev) { struct nvm_id *id = &dev->identity; @@ -223,8 +218,6 @@ static void nvm_free(struct nvm_dev *dev) if (dev->mt) dev->mt->unregister_mgr(dev); - - nvm_core_free(dev); } static int nvm_init(struct nvm_dev *dev) @@ -351,11 +344,12 @@ void nvm_unregister(char *disk_name) return; } - nvm_exit(dev); - down_write(&nvm_lock); list_del(&dev->devices); up_write(&nvm_lock); + + nvm_exit(dev); + kfree(dev); } EXPORT_SYMBOL(nvm_unregister);