| Message ID | 1429853281-6136-52-git-send-email-shannon.zhao@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBCOL5N4BVYCBBYVL46UQKGQESBWFLYY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A69EF20553 for <linaro@patches.linaro.org>; Fri, 24 Apr 2015 05:34:27 +0000 (UTC) Received: by laat2 with SMTP id t2sf9442902laa.2 for <linaro@patches.linaro.org>; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=iC0vGo5jJ2401BWwhXH7lNKa0jxFqMBojlaSRJAxSyw=; b=WqiJAXLyHBZeCquWBFGR8keArleFyEu9WH3mazGBPBrldcivSJ66r+Zw9M3+sdQXy/ ygDRkBXBOSYjBpPtXpiVQC01Kg3PLt4Nmy69x9Q84AGeU+4dVDPhXwCezlJniK+VtkzO 5Z9LWJKrWXsIt2M1voUs7HhoIkSVqEKsDf+aNjM52yrixc/UqvW9V1/mxs3cOZKpf45d XwimKzozC2QbOX9xHuxKnzY04yo/fl4iE8kg7C5HnaUMRGBtt7am+VKvu0TQvZDeFJmP XYfzflXPQFruWyycrs4uMurnbV8afQsXUGHf6Sf4cek0F0qK4QjCeVkwQ3NXxC7bOFvK WSbw== X-Gm-Message-State: ALoCoQk6Vdf3m3sjpuXQM+OFM9LcgEmotHGyZonz7XI+0a24640e4mRrrlVV+oHrr783AQr3CNUg X-Received: by 10.152.116.115 with SMTP id jv19mr3204318lab.9.1429853666617; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.239.130 with SMTP id vs2ls377159lac.97.gmail; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) X-Received: by 10.112.147.73 with SMTP id ti9mr5508946lbb.108.1429853666479; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id i6si7482788lai.30.2015.04.23.22.34.26 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:34:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbcga7 with SMTP id ga7so28645218lbc.1 for <patchwork-forward@linaro.org>; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr5354794lac.41.1429853666290; Thu, 23 Apr 2015 22:34:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp978770lbt; Thu, 23 Apr 2015 22:34:25 -0700 (PDT) X-Received: by 10.66.140.101 with SMTP id rf5mr2715391pab.50.1429853664561; Thu, 23 Apr 2015 22:34:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.34.23; Thu, 23 Apr 2015 22:34:24 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754559AbbDXFeX (ORCPT <rfc822;shannon.zhao@linaro.org> + 2 others); Fri, 24 Apr 2015 01:34:23 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:33856 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754567AbbDXFeW (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 24 Apr 2015 01:34:22 -0400 Received: by obfe9 with SMTP id e9so30221152obf.1 for <stable@vger.kernel.org>; Thu, 23 Apr 2015 22:34:22 -0700 (PDT) X-Received: by 10.182.148.166 with SMTP id tt6mr5597567obb.63.1429853662541; Thu, 23 Apr 2015 22:34:22 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id hc7sm6078221obb.16.2015.04.23.22.34.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:34:21 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Steve Capper <steve.capper@linaro.org> Subject: [PATCH for 3.12.y stable 51/63] arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort Date: Fri, 24 Apr 2015 13:27:49 +0800 Message-Id: <1429853281-6136-52-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index f974085..90422a5 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -698,7 +698,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, kvm_set_pfn_dirty(pfn); } stage2_set_pte(vcpu->kvm, memcache, fault_ipa, &new_pte, - mem_type == PAGE_S2_DEVICE); + pgprot_val(mem_type) == pgprot_val(PAGE_S2_DEVICE)); out_unlock: spin_unlock(&vcpu->kvm->mmu_lock);