From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbdAUSPL (ORCPT ); Sat, 21 Jan 2017 13:15:11 -0500 Received: from mout.web.de ([217.72.192.78]:52251 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938AbdAUSPD (ORCPT ); Sat, 21 Jan 2017 13:15:03 -0500 Subject: [PATCH 5/5] s390/pci: Move two assignments for the variable "ret" in get_pfn() 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: <99fa9b19-143b-1d11-755a-a1de606b6953@users.sourceforge.net> Date: Sat, 21 Jan 2017 19:14:37 +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:jKqiWpSSC/4ulYPacLOgjIEUl97XrxCH68FL40+wjHg4vdK/eeB DQWt+vhuujVNlPQlXAl+i0dBT/zI+BhCbACyQ/oFQ92v+F5XfO2KVF2WI9Y8DzrrEPyaP+F vDqlaiL9KoBDwliKWr6VYglEhmxo9ncG4TbLA3fJwxkO6y16qDaqV1Y1QwRATNr+6TfQhkg 6Qy/FHoMjAm5/Lbt3gNjQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:6slyakWiKO8=:vGCkXk82PoGY43AWtpWM9A aJSkUgdKBcYlGmIXScX6xWY0uZweT/3r6jcH3wxSEuQtDEKpDJsTLAia/pWYAmK7HL+YwkOs0 1Ar9vVqxtpcgPLXUvzbwr5axZUR4UTw+EMjkWnVg11QnECBb8FN97LAZJnf5g11vGtcntHDm1 LH9MP+8QF2HF3V3JKtJlBj+jqghonl9VaPcdLHTrMM6oTYa9/fi5/TSKb2byCtHtf0KIDl95O dacQB5TCX5AEpcqLD7tVaH1otb2fgHQVV7lnLfQS1mn/lpGrE6xFE4+kcED1AqLqq7NnyIjYU SFlIf1RsJOyV1rfhQgsHzU5P6/A47GVKdMQR34J2ppaYjwMP65GFzKDdGvF+qinIZN/Vb76zf C4NWzglW5OpLdNE+q2Dr1A93qFhN9jcgTPR+s1xGih/6dhxKOaLw1a/3cYCsJZSu1Fik90mkW kBfqbgCXqDwCGnCXmwqPtfU2Oid24J+af+xqwK/FiWl8P5mfVQVHErT1OpX1DFslT22d3uYRy 9YX0oEh7M7TSpFU7ZLhlpGv44Je5CJDodA31fwcgrDFqgUhDYH8cEF+Tb4QXfgReqWiMC35jD 9RH+D0K+Z/RSHMy/mfhiYTlHaIqFps5wk49kze4EUvvo9C2Q4aCdQGTlo95F1npG5y3XLuBWg 4mf7hsSOmEH79YThOVW5Y3cDyVjKATRgSxpyJ0Pej/4o32EFqNbczBSyO3lSR3JI7xgaD2I9a I6S3qBdEzZxpuGqoImswPjA6guQb36OPTQgz5DkHUd+HjRmWyJpoXlE8LoTzWlfaqp4icv3ZV 6XYWBLW 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:48:45 +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/s390/pci/pci_mmio.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c index f125858a77e9..400af13ef275 100644 --- a/arch/s390/pci/pci_mmio.c +++ b/arch/s390/pci/pci_mmio.c @@ -18,13 +18,15 @@ static long get_pfn(unsigned long user_addr, unsigned long access, long ret; down_read(¤t->mm->mmap_sem); - ret = -EINVAL; vma = find_vma(current->mm, user_addr); - if (!vma) + if (!vma) { + ret = -EINVAL; goto out; - ret = -EACCES; - if (!(vma->vm_flags & access)) + } + if (!(vma->vm_flags & access)) { + ret = -EACCES; goto out; + } ret = follow_pfn(vma, user_addr, pfn); out: up_read(¤t->mm->mmap_sem); -- 2.11.0