From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753545AbdARWAb (ORCPT ); Wed, 18 Jan 2017 17:00:31 -0500 Received: from mout.web.de ([212.227.17.11]:59860 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752360AbdARWA3 (ORCPT ); Wed, 18 Jan 2017 17:00:29 -0500 Subject: [PATCH 4/5] um: ubd: Move two assignments for the variable "err" in ubd_remove() To: user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, Anton Ivanov , Dan Williams , Hannes Reinecke , Jeff Dike , Jens Axboe , Richard Weinberger References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Wed, 18 Jan 2017 22:59:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:AWgmHX2ODdtSOf2P2VwBSNP03wBTbjQyLkTZ6EiRKJWA73O1ofj xztYU9qEnF+F8nECMaoLzu15F3OXD7oVK0jhqxsutn5x95ljM3u1ObdzGUXveoHkFdghVzi 36I60S3McSYprY2jcYvOCMo15cyJDgmkmP2B3WOda/g85JfSRPP5KiHZMmLYoIC6SQLMgrN qlwpehaST8uhC0bM2CWcQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:B6Z4W08Wk/A=:AMBxYlg8E8T3c7fKgdCjpj SJPH3SfxjKvs6qPa6wRDE4no4v7NlRzly5l33cegtrgKC/+cd8qwnQdwBp+aG3EPm7NDeM6D0 KZXFOMjufRWICMQNYEZ49BLD7g+JI005nnaDHxszzXELzBc7S7fYomwp2ioMnefm73Ne345B7 qXmZ4VK2pNZ6Ke74pF694T8BOs31bOMYsnCz5tCCDktfaZLVMWhDmp0PcanSm80fZmxHoAwa4 +f9+9pdM8fJqj9C/fiGaG3UIYS15Y2GWHO/2zB+s0Xz/JVO7BWjShxk5qKiE/ErmCqCaGKEG1 SiqOWuyh3e9aRB10RbyxkIjzCaC8aPW1fTcqGk+oszf1Uoyz0PpUmND4jF2wEmNtpac6VY2/0 xMHVokEdEZjmyGIH2mop8yUQ9PgPdK9ZOlwNfTYySIS677Mnj0R/P0dRXJLkaTFwoCEr3aA6s CLy8Vwdr3/x3FyfRgmO877/zlzsZr8U+xdkWe8yrg5zh9JTX3U9ICKr3Qpv6xI8g+GuQwqjyY CaBZTqJMd1YjlS8kOJQaHwMGXjIFBOCvr6QGj32TtiWDDwx0whxXqn99VUYKY5DcByRGcg1y5 GaqdzyUcIashuecUgax42e2HTZJbo9Z/ZLQZM75WRkYbKa+9lHWhEeJI9PuMPaBmtDIggAG9F 83fzuZVmH8OO6jVZI7s9E2gswuvKFFyVDb8DIyHQBzssux5ge+YwgWb2ZssGK+v2hlwaUrQSr tvUkAGIEc5xKdI4FTlLHMRzGHJjtmRi7naEH47R4EmXK7Jc/4F1BjqD2LKwD7ArQmuSsONCfO Tbhe4Su Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 18 Jan 2017 22:23:18 +0100 A local variable was set to an error code in two cases before a concrete error situation was detected. Thus move the corresponding assignments into if branches to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/um/drivers/ubd_kern.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 85410279beab..6d686f735538 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -1049,19 +1049,21 @@ static int ubd_remove(int n, char **error_out) { struct gendisk *disk = ubd_gendisk[n]; struct ubd *ubd_dev; - int err = -ENODEV; + int err; mutex_lock(&ubd_lock); ubd_dev = &ubd_devs[n]; - - if(ubd_dev->file == NULL) + if (!ubd_dev->file) { + err = -ENODEV; goto out; + } /* you cannot remove a open disk */ - err = -EBUSY; - if(ubd_dev->count > 0) + if (ubd_dev->count > 0) { + err = -EBUSY; goto out; + } ubd_gendisk[n] = NULL; if(disk != NULL){ -- 2.11.0