From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752975AbdARV5e (ORCPT ); Wed, 18 Jan 2017 16:57:34 -0500 Received: from mout.web.de ([212.227.15.3]:55363 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751842AbdARV5V (ORCPT ); Wed, 18 Jan 2017 16:57:21 -0500 Subject: [PATCH 1/5] um: port: Move an assignment for the variable "fd" in port_wait() 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: <4940ae24-c7ae-66ce-4c2a-5283607a5549@users.sourceforge.net> Date: Wed, 18 Jan 2017 22:56:17 +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:kBz9rmim4+SZnvBqXSFsmGk0zV2zEiel1PsaRH6EbkHmL8fc24f VAgvMFX5KwrVHU/Wyy6t+7+4xbzGRU4zT+4xW6LsFS/6Q7uG7PyvAjNNdHnLyi+O5lC77r3 2lPy6D1PaRPRr7zM7YjCIXdnxpFxM3o4iiRJxMyhJbXxB8qjAv+GYJkICW+xJGhvemDzq6k jElwfoCJuHyUcc7I33G4w== X-UI-Out-Filterresults: notjunk:1;V01:K0:MVM6m1y2dgg=:pv7bCk6J54zrSLTsRADQLk MP15ObhXW4vJtBX/mL8A5kMoSahN4/vb94PYUTI6WFi4XJ42XOIS8q6Zvml1Lecw3MERb8Weu SDz26Z3e1GccmBSFW4VUya8fql7lH/diRtSnYdxPjh45EC2i+Lb6BkGxS/zGeWK/WMTzgX2P/ rT5m8CiD6t1i5rIVDMouDMnAvhlTCuk1nK7QiukRLMa8xsZVrGnhJtg7WTYgEQoXdzjq8twM4 fk3Vb7Jx7zvP/S7tgTPQZHnwS5qCeE/CcPWH9n9kqyu7skhAbGjuKsC7/dA4DXixxVtKQV1Ki j4NjlC5MWuIBKCwfBYyGEKCCCOlWI3oGGgt2K57PS0CTRvaKyIGuzAdk1/xBAB7hTj3EhVOjS tVp1qA1Dva3bcR7tbw5m+uuU8PzH5BH+PVN2FxV8HRtCSURMG41DSerY1/a1nwVDl6NuETHiU mAcL4hmQJtWAIwdh9HuyKoi/TMDRNJ9PxX6x1NS1tlCo7HTp8SIwBl+HglpbEHhQqcT3Wobsd RnJTkofeol/r0JTBf4o6pTMS7Cd/Fq+5/Qen6ovKUL2N1AfwsX+6fOkwrhpTaPOKNDxPQSNRD AJdHcQXKIEA56bUk1UZQ+sC9d5z1G0CHC6+cShueRr4ZO+fxmUPxHUFn65GDEWtxDHnzWv7WQ Si0tiUii8MAFEXX2fEBK4OERCGHVNfvfSYd/ZlMZija3NSuzAtMkUpGVwxNjpCxXCTp1mT62j vCc/B6ZekBaNG8azLzAj5xq/VjvvO7MdWvdODlEEUjRD5DM8GP7oLCNc5gixkTQ7zJVygnt6Y 9QvuV6+ 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 21:40:29 +0100 A local variable was set to an error code in one case before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/um/drivers/port_kern.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c index 40ca5cc275e9..b2bbda21c5f3 100644 --- a/arch/um/drivers/port_kern.c +++ b/arch/um/drivers/port_kern.c @@ -230,10 +230,10 @@ int port_wait(void *data) atomic_inc(&port->wait_count); while (1) { - fd = -ERESTARTSYS; - if (wait_for_completion_interruptible(&port->done)) + if (wait_for_completion_interruptible(&port->done)) { + fd = -ERESTARTSYS; goto out; - + } spin_lock(&port->lock); conn = list_entry(port->connections.next, struct connection, -- 2.11.0