From b61150a8e04a595ea055d5d8bd4538206b07d409 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Fri, 12 Mar 2010 08:45:39 +0800
Subject: [PATCH] --- yaml --- r: 197660 b: refs/heads/master c:
 5c0d0920a270b9f2aa20c1cecb162703da32e766 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/ia64/kvm/kvm-ia64.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c834fc0a709e..461c66bf036d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec68798c8fd0f01cdbd3f3e1a970e76a644cf08e
+refs/heads/master: 5c0d0920a270b9f2aa20c1cecb162703da32e766
diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c
index 7f3c0a2e60cd..38d51302f5b3 100644
--- a/trunk/arch/ia64/kvm/kvm-ia64.c
+++ b/trunk/arch/ia64/kvm/kvm-ia64.c
@@ -1535,8 +1535,10 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 			goto out;
 
 		if (copy_to_user(user_stack, stack,
-				 sizeof(struct kvm_ia64_vcpu_stack)))
+				 sizeof(struct kvm_ia64_vcpu_stack))) {
+			r = -EFAULT;
 			goto out;
+		}
 
 		break;
 	}