From patchwork Mon Nov 2 15:41:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 57045 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA2Fgidc026121 for ; Mon, 2 Nov 2009 15:42:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755416AbZKBPmJ (ORCPT ); Mon, 2 Nov 2009 10:42:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755324AbZKBPmI (ORCPT ); Mon, 2 Nov 2009 10:42:08 -0500 Received: from david.siemens.de ([192.35.17.14]:22174 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755379AbZKBPmD (ORCPT ); Mon, 2 Nov 2009 10:42:03 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nA2FfsRd019279; Mon, 2 Nov 2009 16:41:54 +0100 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id nA2FfsZ9019886; Mon, 2 Nov 2009 16:41:54 +0100 Message-ID: <4AEEFDC2.4010808@siemens.com> Date: Mon, 02 Nov 2009 16:41:54 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm , Glauber Costa Subject: [PATCH] KVM: x86: Clear flags field on return from KVM_GET_CLOCK Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1f68798..dd229b6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2577,14 +2577,11 @@ long kvm_arch_vm_ioctl(struct file *filp, ktime_get_ts(&now); now_ns = timespec_to_ns(&now); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; + user_ns.flags = 0; if (copy_to_user(argp, &user_ns, sizeof(user_ns))) r = -EFAULT; - r = -EINVAL; - if (user_ns.flags) - goto out; - break; }