From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754257AbbGBTFS (ORCPT ); Thu, 2 Jul 2015 15:05:18 -0400 Received: from mout.web.de ([212.227.15.14]:63614 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754076AbbGBTFL (ORCPT ); Thu, 2 Jul 2015 15:05:11 -0400 Message-ID: <55958B61.1070002@users.sourceforge.net> Date: Thu, 02 Jul 2015 21:05:05 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Dan Williams , Linux Kernel Mailing List CC: kernel-janitors , Julia Lawall Subject: [PATCH 2/2] tools/testing/nvdimm: Improve error detection in __test_alloc() References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <559589D3.8000709@users.sourceforge.net> In-Reply-To: <559589D3.8000709@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:hNJJtkyrz5zjUflcY2PrfY1hACfiTLhsOoHQ2ZuZRuI7rtXRqE3 2CypCcujyxnls5YkTF1NVGlYfRy81BKE/bF6Jqo/OSwlJtmLF2OIdRpD1zNKpQQmIaIYdAE FYGIfU+8LHO7mWfZnWkCkoEXoTi7Ql/qtFozCY/8bp/zCwQOnw+RY8cRFOUBC1QXiej+qES yr0BrIoIeJPK5wf4nmsfw== X-UI-Out-Filterresults: notjunk:1;V01:K0:dtfTh4Hupaw=:sWtpqjp/ahDEcwgHmVU/9M fqTxO9ciN1g7Z6qh4PQaxLMOYtQJCZXAfxq05N6Dewl8dkMjymbc461PF1ck6l4DgSd+sPov3 rGAgJAs0yJwMIZGkM/BejD02fWdg+ua/5sGfRIJKVlHz1USSfkgKGV2ihCfQtNu9lNvzZnzrl vpXfhALRpofdgN07RRg2J8mamvDDBnRmkQRrai3ytiynkBTwDc/ozliCsIt1jzZi9ZK++FzE6 5mw4qP95K4/LgukPxghcnsZSR1a1nbOvG6oiom3eaxSvb7B1qN4sP2O8ZCifOT3OgCsJw/Y2d r+6wQu7jo3+xgu+uTs7C4i9v5d2Q8b9rrQqbrZ3XU/Qks9zvd1AML7RW59FJ9JeuGw2uKhbU4 xFD0knkMuC0dFkyoYlp0zQ0cpDaEJA+HXtJ1mk73FMISFjoCTXDOjQFxWFvJ8tdXwNCO5snGy BQmCiL1aJbCnIzx18MDWFkeeO2zL3fCKU1/829PLKBDBDTLVqws00ftl9WKcZ3KZ5tkulSL2a sHQbSjFYHfy+XcXlUi+HkNQbUbr4D6SPI4LfP7U5ShkT42YOfxclJf1uz5Bm0erVcKGcgH07b Tj/SVDvY1p/N9uajDMNxHSL4ONTernXg2Mp9YJD2co67a6iyoeYhN+a28Sj8yy7AzzFypdLl3 51r47xl0pFBHJh4iYJiV5zHZauUPKuxAvLYfhIvIvp478rZm1kuvH4wKqsRTNDW8I/Lk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 2 Jul 2015 20:45:53 +0200 Three checks were combined at the beginning of the __test_alloc() function. This implementation detail can become safer according to the Linux coding style convention. * Return directly if a null pointer was passed for the variable "buf". Delete an unnecessary check then. * Allocate memory for the data structure "nfit_test_resource" only if a previous allocation succeeded. * Rename a jump label. Signed-off-by: Markus Elfring --- tools/testing/nvdimm/test/nfit.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/nfit.c index 9c910f1..d5f22ea 100644 --- a/tools/testing/nvdimm/test/nfit.c +++ b/tools/testing/nvdimm/test/nfit.c @@ -244,16 +244,21 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma, void *buf) { struct device *dev = &t->pdev.dev; - struct resource *res = kzalloc(sizeof(*res) * 2, GFP_KERNEL); - struct nfit_test_resource *nfit_res = kzalloc(sizeof(*nfit_res), - GFP_KERNEL); + struct resource *res; + struct nfit_test_resource *nfit_res = NULL; int rc; - if (!res || !buf || !nfit_res) - goto err; + if (!buf) + return NULL; + res = kzalloc(sizeof(*res) * 2, GFP_KERNEL); + if (!res) + goto free_memory; + nfit_res = kzalloc(sizeof(*nfit_res), GFP_KERNEL); + if (!nfit_res) + goto free_memory; rc = devm_add_action(dev, release_nfit_res, nfit_res); if (rc) - goto err; + goto free_memory; INIT_LIST_HEAD(&nfit_res->list); memset(buf, 0, size); nfit_res->dev = dev; @@ -267,8 +272,8 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma, spin_unlock(&nfit_test_lock); return nfit_res->buf; - err: - if (buf && !is_vmalloc_addr(buf)) +free_memory: + if (!is_vmalloc_addr(buf)) dma_free_coherent(dev, size, buf, *dma); else vfree(buf); -- 2.4.5