From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756603AbcIUJve (ORCPT ); Wed, 21 Sep 2016 05:51:34 -0400 Received: from mail.sigma-star.at ([95.130.255.111]:45997 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbcIUJvb (ORCPT ); Wed, 21 Sep 2016 05:51:31 -0400 From: Daniel Walter To: linux-mtd@lists.infradead.org Cc: linux-kernel@vger.kernel.org, computersforpeace@gmail.com, dwmw2@infradead.org, boris.brezillon@free-electrons.com, Richard Weinberger Subject: [PATCH v2 22/46] mtd: nandsim: Cleanup destroy handlers Date: Wed, 21 Sep 2016 11:51:27 +0200 Message-Id: X-Mailer: git-send-email 2.8.3 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Richard Weinberger Make sure that we free stuff only after it has been initialized. Signed-off-by: Richard Weinberger --- drivers/mtd/nand/nandsim.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index bac3fde..816d795 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -770,6 +770,9 @@ static void ns_ram_destroy(struct nandsim *ns) struct ns_ram_data *data = ns->backend_data; int i; + if (!data) + return; + for (i = 0; i < ns->geom.pgnum; i++) { if (data->pages[i].byte) kmem_cache_free(data->nand_pages_slab, @@ -784,15 +787,22 @@ static void ns_cachefile_destroy(struct nandsim *ns) { struct ns_cachefile_data *data = ns->backend_data; + if (!data) + return; + kfree(data->file_buf); vfree(data->pages_written); filp_close(data->cfile, NULL); + kfree(data); } static void ns_file_destroy(struct nandsim *ns) { struct ns_file_data *data = ns->backend_data; + if (!data) + return; + kfree(data->file_buf); fput(data->file); kfree(data); -- 2.8.3