From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751373AbdAUSN7 (ORCPT ); Sat, 21 Jan 2017 13:13:59 -0500 Received: from mout.web.de ([217.72.192.78]:51763 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751055AbdAUSNs (ORCPT ); Sat, 21 Jan 2017 13:13:48 -0500 Subject: [PATCH 4/5] s390/pci: Move an assignment for the variable "ret" in s390_pci_mmio_write() To: linux-s390@vger.kernel.org, =?UTF-8?Q?Gerald_Sch=c3=a4fer?= , Heiko Carstens , Martin Schwidefsky , Sebastian Ott References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: Date: Sat, 21 Jan 2017 19:13:33 +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=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:aWXSpVPK0ONCdZsdT4ecXvsvZ8gG4lin/3dQKlXUZG79lTPJXaX CszhmLiZtIyLOrqRfTOvouLN+zbUW0o9g1fsGr47vYKpODo0ADe8PMGQMCdOwXXmxkIq6Vk ChzEsAnjq6zTW7hZNH3d2ythig4CPYCm9oIOThL4vVoWIFNeg3/+mXlv7RPX378BDTbRh0m I723u9cIkkd85qAAdQcgQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:kSkLRt2+mOs=:qo23wamjneOWtMMSGpdjXw zZYlYT6VXCK01KqD0CP+tAFn/S8a73J+b2Rh0ePNNs6teBYPqrSzKhMxYHsKd47FBUXo7U9Ya 0/AlBl3b0Yf2uAciKtVvfLZNIrad2seJTp22YOblqCmDymPqBLkXinGROqrsgOVv91Mpk+3Sc Cbl/2pV/XTo/FzDfYxwTxD1L0sMFBFSA3Fz7dMU23qALQkKzsQ+iZ22gR9xACFSUh0k8D3OLa TKU7qCTBkR6BRtGmJY3nJUhmwgKzfnhnxTw3iqQhwoIJolbg8Oo5y+voUG3py3SasrchndXs2 xLWHxFrZXDevU1TkgOdxafo2U6lHQOzq1pLS7a9N/CC4tWyVxjJz8H8lSJuWbSMDcFg3b+oUA BctWMhqO9maxqtR3uOdiGYruy/tVCLNlzQAwNFqtVgo0JqDDybd7l59D59q3Aca68cXD5VKP3 XNHTSt0S2HyXPZcJGkO9U+HpKK36XJvSDi8YG2AUncZ+NuYx/oBOfjg1ahTNRVZLkplXlfPiN VCeNo++J1MQ9ZrVuPNE7mknHF4UrbCCAm3HH31hp17j5Ka0MieVeBl3RyGDbZg6+GNOqWU3fh QT/Ak2Cbb8XLKvAeMK9bpTohJQM9pnibhFspp6qVzoEibgchSyPt36leq/5tcJG+jbx7KSDE5 GXmjGsScIYT8/XLnZ7K7zMtKTUt05OMuQjXtOWEP3hPDn5kO5Dy/3eQqKBOvUrFsX9J799CkG AttCOOME3OO9cLp0dSz8iEMz1SrdC06E/jizL2dc1jyrkgM8PLeyvv6x565Ei6Mzc4fTW1mR6 iLX5M23 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 21 Jan 2017 18:35:00 +0100 A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. Signed-off-by: Markus Elfring --- arch/s390/pci/pci_mmio.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c index b1bb2b72302c..f125858a77e9 100644 --- a/arch/s390/pci/pci_mmio.c +++ b/arch/s390/pci/pci_mmio.c @@ -57,12 +57,11 @@ SYSCALL_DEFINE3(s390_pci_mmio_write, unsigned long, mmio_addr, goto out; io_addr = (void __iomem *)((pfn << PAGE_SHIFT) | (mmio_addr & ~PAGE_MASK)); - ret = -EFAULT; - if ((unsigned long) io_addr < ZPCI_IOMAP_ADDR_BASE) - goto out; - - if (copy_from_user(buf, user_buffer, length)) + if ((unsigned long)io_addr < ZPCI_IOMAP_ADDR_BASE || + copy_from_user(buf, user_buffer, length)) { + ret = -EFAULT; goto out; + } ret = zpci_memcpy_toio(io_addr, buf, length); out: -- 2.11.0