From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751991AbdAVSNY (ORCPT ); Sun, 22 Jan 2017 13:13:24 -0500 Received: from mout.web.de ([212.227.17.12]:52274 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751766AbdAVSL4 (ORCPT ); Sun, 22 Jan 2017 13:11:56 -0500 Subject: [PATCH 1/9] KVM: Return directly after a failed copy_from_user() in kvm_vm_compat_ioctl() To: kvm@vger.kernel.org, Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <45c0ff89-7f60-a58a-3ba7-a938709aaf00@users.sourceforge.net> Date: Sun, 22 Jan 2017 19:11:48 +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:WmusNHJKYNO+PMYjeQl6hbO/tdM1v2qEolIPtDdMIOcY2fmuSf9 u8Tu2pglO+Dxo2iDYatAskIanZ8e6W8q3DoNDUdAxg/M0FOqD9bEHL2ocd3WZ7eeV3nBhAT GQGZzZHRNXPYQz01iJH1itww6ogO9lcYL0q9Xgy7SFj6fw8esrI1XzQ6FmuM049Q1raKAp8 FhSx1p0rPiFxAz/h+Z+CA== X-UI-Out-Filterresults: notjunk:1;V01:K0:BEniNbyhBdI=:4enI5yJsNc/JKx2uzYuEka QSLjRIN1aJ/Zy+/J5+v8nkDNvvxlE4oPQrVXw3Ux51D1ugTpIfnVgaLM78AENbUJeYdjUsGHX oC912qGxvVeXhrdUac4ikkDsRF+5L0oWsAuptBEh3NXAKwEuXOq1ZaxC9ao0WxNkIx52IPnTD eBA5KetUfQRmlp5ZauVuORsdzBOwKJpMvDsLHWw/SOjAue4Ogeb80YfEgWlM8xt7/xm5+c7Ts dJeBli7Np9/k+jVS1gTgNE/IVkg3MG2rvk7KEu+3re2Z7na0Z96GcrrDy+aomgAE5rZlCYI7h secYa/eu+rGQHwBV252Hn9tdGwoQ492FvXaV7SUshROV49Tf3Eq10wu0YkLn0ZmojFAv6TSrH 2SWKCJz3SS/g87LfWYxw8eOfyNY9nddWg1uSEaQUZwu5K57HzQlTNeDkTZlZSmWLde1Y+ZiOH JHftTHapSmN/Urfb5Q+JydZ8akmTeXCaaVlU7yPBkBuuzPrL4WRZMFgDEaOxHekhCCaD5+IML BUSl1844++JUzpMua3Zm1MZxSuwxgwGCdjoOIwYwjbShjqNpoo2ynZiavVkqNwrX41EScQl51 d5IAIKkfDA20eaWwTMbA+ZyopobXdQFZrhKYlOJF5upobQEHYLEsr2FDGHZ1e+ZVC6nnnHHwK ejZlBTN9t4JNbvafWA/SWwwCiUcDR78V2qccgfl57MQKjiPwjUfbL9TDigJY3i/gBZ3NO93GH wyKZKUESS3G4l7TVxV/Mlq8e3y3EKoIr2XCPNMs8GjSHjrU7esYqJOODXFFM9juPudQP1A1mL 1hPZOVa Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 22 Jan 2017 11:30:21 +0100 * Return directly after a call of the function "copy_from_user" failed in a case block. This issue was detected by using the Coccinelle software. * Delete the jump label "out" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- virt/kvm/kvm_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index de102cae7125..eeb340708d97 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3133,10 +3133,9 @@ static long kvm_vm_compat_ioctl(struct file *filp, struct compat_kvm_dirty_log compat_log; struct kvm_dirty_log log; - r = -EFAULT; if (copy_from_user(&compat_log, (void __user *)arg, sizeof(compat_log))) - goto out; + return -EFAULT; log.slot = compat_log.slot; log.padding1 = compat_log.padding1; log.padding2 = compat_log.padding2; @@ -3148,8 +3147,6 @@ static long kvm_vm_compat_ioctl(struct file *filp, default: r = kvm_vm_ioctl(filp, ioctl, arg); } - -out: return r; } #endif -- 2.11.0