From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752166AbdLFShS (ORCPT ); Wed, 6 Dec 2017 13:37:18 -0500 Received: from mout.web.de ([212.227.15.3]:60437 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbdLFShQ (ORCPT ); Wed, 6 Dec 2017 13:37:16 -0500 Subject: [PATCH 2/3] uio: Return directly after a failed kzalloc() in uio_dmem_genirq_probe() From: SF Markus Elfring To: kernel-janitors@vger.kernel.org, Greg Kroah-Hartman Cc: LKML References: <2efe226c-065a-b77d-d278-4345ab2586b1@users.sourceforge.net> Message-ID: Date: Wed, 6 Dec 2017 19:37:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <2efe226c-065a-b77d-d278-4345ab2586b1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:uMqdJ7Yf83iTbzsq7/suCIy8ndz5edXAB7ptU6ncwDw0qxLkg7k 9/AqiH+RPj/XbGql/fJCLcBEqZ44HOuwBSGvlMibxEXNKxdSLxr0fxuE149rVheY/TC1uBQ mnAadNQqgKZZLcf29ny56Jx3aA2Gp+rT9r7WE11AhqAB99vRJRfXwdzTayU+ZN16GQENLYF lKKk4zOgLaAGGiNWD1P/Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:uHEEsCWlwHc=:WzjC/MTiULi3xgt5BVMSjG nrcVpDJFZn1TmxjKXhOy2OiUBvWYYcWX3uFR7nwmqvIrAiHGNhksqxMUnFRdsBSV8d3XHDKzR RnWdVmilGU++7l5Y5iGsf9Giv4eVYwgErbQqIozS/lOXj41UwcWoKS29jJy6FLMaNevJW+ptM V3Hhb5AJMiI2yrDrBZjPmBOFDBPl8AZYEJJze9yC1tycRDzxX1H6D+ryL0kLa0uisVYTEmS1y i+vU1DyvJ9DgnruXlSm6aFLJM7/YI/hUADuzqxmseOdaCJlqqAWBWkAze5nIYzG5UX2gN7eKi GYkkQc87xa1SvgmN0/7nVTSYke6nrDrFOriGWLqahL+nsFVncjtaX52Zpqzabq8MRvikkuV4X jDSVrdYW5noEleiog+OetUWIIKw7PZSxIk4MYswhqcxOkXG0MWSY4liQOmdhIxD2OXa3RzIn4 DzQR2y2GbA6uuRXOsM2hmbdVxlexiz1/1QNgQE5TpeRSLQPDB9l2UIJmh3Rv2mxm7V9iSvoNM CW6D3qYVQwE/d6U305PpXP9TFJbuQ7sTsqR6+U7xjP7/fOcZuoiNxXkaEFZ6vTV8S2DOW9q7L eg/KR3HumRQv/RShyZGYAT1DR5EfeRp9jMQDEfKc8DqOANM6WwJmvfbqMxrCSw1ziN/NE9fNP B8fDSvMYYeu6n1SAFAj+Q8qFQNRHpSUM6CT+HiIuo+5RJihq5X9jAh2ccgQz6JX8sRnbcuNf5 DBHNtNlCMxFNtIJijnI2nw48UNJlux9+nEYeRWk+uhrKAcGRoF3kxoblrAcoIn6B+/lLiAder 9yUIHnWu2FReMCq8UlGNtueWvfFAgFoVlJUocFT0J+mKD82BllqZq6NNTfK7CFHLJDQZLYD Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 6 Dec 2017 19:11:49 +0100 * Return directly after a call of the function "kzalloc" failed in an if branch. * Delete the jump label "bad2" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/uio/uio_dmem_genirq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c index b7b0acd1bf01..4f230ce8b861 100644 --- a/drivers/uio/uio_dmem_genirq.c +++ b/drivers/uio/uio_dmem_genirq.c @@ -158,10 +158,9 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) /* alloc uioinfo for one device */ uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL); - if (!uioinfo) { - ret = -ENOMEM; - goto bad2; - } + if (!uioinfo) + return -ENOMEM; + uioinfo->name = pdev->dev.of_node->name; uioinfo->version = "devicetree"; @@ -285,7 +284,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) /* kfree uioinfo for OF */ if (pdev->dev.of_node) kfree(uioinfo); - bad2: + return ret; } -- 2.15.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Wed, 06 Dec 2017 18:37:14 +0000 Subject: [PATCH 2/3] uio: Return directly after a failed kzalloc() in uio_dmem_genirq_probe() Message-Id: List-Id: References: <2efe226c-065a-b77d-d278-4345ab2586b1@users.sourceforge.net> In-Reply-To: <2efe226c-065a-b77d-d278-4345ab2586b1@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kernel-janitors@vger.kernel.org, Greg Kroah-Hartman Cc: LKML From: Markus Elfring Date: Wed, 6 Dec 2017 19:11:49 +0100 * Return directly after a call of the function "kzalloc" failed in an if branch. * Delete the jump label "bad2" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/uio/uio_dmem_genirq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c index b7b0acd1bf01..4f230ce8b861 100644 --- a/drivers/uio/uio_dmem_genirq.c +++ b/drivers/uio/uio_dmem_genirq.c @@ -158,10 +158,9 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) /* alloc uioinfo for one device */ uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL); - if (!uioinfo) { - ret = -ENOMEM; - goto bad2; - } + if (!uioinfo) + return -ENOMEM; + uioinfo->name = pdev->dev.of_node->name; uioinfo->version = "devicetree"; @@ -285,7 +284,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) /* kfree uioinfo for OF */ if (pdev->dev.of_node) kfree(uioinfo); - bad2: + return ret; } -- 2.15.1