From patchwork Sun Feb 15 20:22:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 44691 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3E4F021533 for ; Sun, 15 Feb 2015 20:25:32 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf13295566wib.2 for ; Sun, 15 Feb 2015 12:25:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=Q/N41qboM9yMHQaCDxe7iPc8/aju3zemhuQ/8vQ6N3U=; b=XVKemxECbTSt3p5apKdCC/SDJ3AdLWC2VLW3uJfmhKY6yeTv+ySk9LaABf7NrzdPpo fYPbeuMFtlqOqIckwMLklzGArnSpoAewwLJji2EcWE8V7dA5kGpqZOm31ay9KUdC8Y61 iQV+04sEMYhXCuSEHRgRvvEvx/fCg4dGjilqoz6R5sMG45jY9J89/9iXo0MmeVZQbkkg OQLd8UFDTDn1qIybOa08rRP1nqh8yYkzRBrOq7LUeEILbe1Y++tAe9KcNk/fxwovGiEM GVLVH5hVmhQg8jw33u5RcFvdPPHwI2rwvJ/ttEF07zFDFm8fuCm9VaOmx1RYmJkc++H9 mWKw== X-Gm-Message-State: ALoCoQmvpK2n8sFKdNIQR7eVtNXuVOXJhLr9/nydHEZEU0aW+6L0G6JSGdlDF5xSZ3ivrcrWyqcj X-Received: by 10.180.105.129 with SMTP id gm1mr2395049wib.3.1424031931583; Sun, 15 Feb 2015 12:25:31 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.42 with SMTP id v10ls453933laj.56.gmail; Sun, 15 Feb 2015 12:25:31 -0800 (PST) X-Received: by 10.152.1.170 with SMTP id 10mr18545997lan.89.1424031931289; Sun, 15 Feb 2015 12:25:31 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id mt5si7598986lbb.59.2015.02.15.12.25.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Feb 2015 12:25:30 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id p9so23035823lbv.3 for ; Sun, 15 Feb 2015 12:25:30 -0800 (PST) X-Received: by 10.112.181.41 with SMTP id dt9mr19268465lbc.56.1424031930880; Sun, 15 Feb 2015 12:25:30 -0800 (PST) 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.35.133 with SMTP id h5csp1205758lbj; Sun, 15 Feb 2015 12:25:30 -0800 (PST) X-Received: by 10.68.65.110 with SMTP id w14mr33881657pbs.57.1424031928950; Sun, 15 Feb 2015 12:25:28 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id rc13si9415672pdb.85.2015.02.15.12.25.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Feb 2015 12:25:28 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YN5id-0002v6-0P; Sun, 15 Feb 2015 20:23:07 +0000 Received: from mail-la0-f54.google.com ([209.85.215.54]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YN5iS-0002nR-Nm for linux-arm-kernel@lists.infradead.org; Sun, 15 Feb 2015 20:22:57 +0000 Received: by labgd6 with SMTP id gd6so24984798lab.7 for ; Sun, 15 Feb 2015 12:22:34 -0800 (PST) X-Received: by 10.112.40.201 with SMTP id z9mr18271961lbk.117.1424031754349; Sun, 15 Feb 2015 12:22:34 -0800 (PST) Received: from localhost.localdomain (188-178-240-98-static.dk.customer.tdc.net. [188.178.240.98]) by mx.google.com with ESMTPSA id f9sm2563600laa.20.2015.02.15.12.22.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Feb 2015 12:22:33 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [GIT PULL 1/2] ARM: KVM: Fix size check in __coherent_cache_guest_page Date: Sun, 15 Feb 2015 21:22:42 +0100 Message-Id: <1424031763-9534-2-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1424031763-9534-1-git-send-email-christoffer.dall@linaro.org> References: <1424031763-9534-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150215_122256_954144_ADACEFF8 X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.54 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.215.54 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Marc Zyngier , Jan Kiszka , Christoffer Dall , kvm@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: christoffer.dall@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.172 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 From: Jan Kiszka The check is supposed to catch page-unaligned sizes, not the inverse. Signed-off-by: Jan Kiszka Signed-off-by: Christoffer Dall --- arch/arm/include/asm/kvm_mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index 1bca8f8..90052de 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -186,7 +186,7 @@ static inline void __coherent_cache_guest_page(struct kvm_vcpu *vcpu, pfn_t pfn, bool need_flush = !vcpu_has_cache_enabled(vcpu) || ipa_uncached; - VM_BUG_ON(size & PAGE_MASK); + VM_BUG_ON(size & ~PAGE_MASK); if (!need_flush && !icache_is_pipt()) goto vipt_cache;