From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69720C43381 for ; Sat, 30 Mar 2019 19:54:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 32FE82184D for ; Sat, 30 Mar 2019 19:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553975661; bh=7A2Tni/91J7GgsI78CuOYFAwEvL2KLntLSLRZV3iR2Y=; h=Subject:To:Cc:From:Date:List-ID:From; b=wcLGt8qutZJJ5BxTYqTozA8nTDJnyIF5Yba9B6L+kS6EyvVZibG694fkuG72xEQdk So4tYOkTyeZ+7pwUlAw4v+Ih7qUpjo7wqr1a5nQzrzyzDQ1ScXlqgxOXFLReSRDdIs 0qkMFz981SeSA5euzMg9abVz6vonsxd0bgQpZ+mM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730917AbfC3TyT (ORCPT ); Sat, 30 Mar 2019 15:54:19 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:41055 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730542AbfC3TyT (ORCPT ); Sat, 30 Mar 2019 15:54:19 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id ECCCD21B67; Sat, 30 Mar 2019 15:54:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sat, 30 Mar 2019 15:54:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=dW1DPW WRiBSXyc8+wRea4+QdGhMpOUCycFnVAETJ8P0=; b=VLiIlJOtCgVdSzb/oYZ8sn 0v+c9nAqqIDUfUEGAGiSCl5QUx7VFM/5U/Q5dfTRR+uz7PjANAvNJMYf3Tp1YJn/ Gc1rLmX38mpyAK5lO4ksGq4QoPOtZt+xRFGK/6/McOnZrm2RPCE0ztpNgZ66oJ6m CTuUaYbkkC/f1NcggStTTVoBjYA+NVw84ZQ8RYIZ56zTgKSgYi/OWdo0cSFCqquu e38IcetlcERmsOg2HWBuTgDP9NQGarPZDcs3iwIivF/zwqRuvahKz6ADxF48421x 9E/XX8dC1OIDBHzHrFHkr3x9n7+qjSiJyyZodD2unuXv2BIZZSb/JIqxoYMp+fRw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrkeelgddufedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeeivddrudduledrudeiiedrleenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (unknown [62.119.166.9]) by mail.messagingengine.com (Postfix) with ESMTPA id C746D10311; Sat, 30 Mar 2019 15:54:17 -0400 (EDT) Subject: FAILED: patch "[PATCH] drm/i915/gvt: Fix MI_FLUSH_DW parsing with correct index" failed to apply to 4.14-stable tree To: zhenyuw@linux.intel.com, yan.y.zhao@intel.com Cc: From: Date: Sat, 30 Mar 2019 20:54:15 +0100 Message-ID: <15539756551238@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 13bcb80b7ee79431fce361e060611134cb19e209 Mon Sep 17 00:00:00 2001 From: Zhenyu Wang Date: Wed, 20 Feb 2019 16:25:04 +0800 Subject: [PATCH] drm/i915/gvt: Fix MI_FLUSH_DW parsing with correct index check When MI_FLUSH_DW post write hw status page in index mode, the index value is in dword step and turned into address offset in cmd dword1. As status page size is 4K, so can't exceed that. This fixed upper bound check in cmd parser code which incorrectly stopped VM for reason of invalid MI_FLUSH_DW write index. v2: - Fix upper bound as 4K page size because index value is address offset. Fixes: be1da7070aea ("drm/i915/gvt: vGPU command scanner") Cc: stable@vger.kernel.org # v4.10+ Cc: "Zhao, Yan Y" Reviewed-by: Yan Zhao Signed-off-by: Zhenyu Wang diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 77ae634eb11c..bd95fd6b4ac8 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -1446,7 +1446,7 @@ static inline int cmd_address_audit(struct parser_exec_state *s, } if (index_mode) { - if (guest_gma >= I915_GTT_PAGE_SIZE / sizeof(u64)) { + if (guest_gma >= I915_GTT_PAGE_SIZE) { ret = -EFAULT; goto err; }