ping for backport.
On Tue, Aug 11, 2020 at 03:16:51PM +0800, Yan Zhao wrote:
hi This is the upstream commit dbafc67307ec06036b25b223a251af03fe07969a, and we'd like to backport it to v5.4. have done the code rebase for the attached patch.
lri usually of variable len and far exceeding 127 dwords.
Fixes: 00a33be40634 ("drm/i915/gvt: Add valid length check for MI variable commands") Signed-off-by: Yan Zhao yan.y.zhao@intel.com Acked-by: Zhenyu Wang zhenyuw@linux.intel.com Signed-off-by: Zhenyu Wang zhenyuw@linux.intel.com Link: http://patchwork.freedesktop.org/patch/msgid/20200304095121.21609-1-yan.y.zh...
drivers/gpu/drm/i915/gvt/cmd_parser.c | 12 ------------ 1 file changed, 12 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index e753b1e706e2..582e28be383c 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -963,18 +963,6 @@ static int cmd_handler_lri(struct parser_exec_state *s) int i, ret = 0; int cmd_len = cmd_length(s); struct intel_gvt *gvt = s->vgpu->gvt;
- u32 valid_len = CMD_LEN(1);
- /*
* Official intel docs are somewhat sloppy , check the definition of* MI_LOAD_REGISTER_IMM.*/- #define MAX_VALID_LEN 127
- if ((cmd_len < valid_len) || (cmd_len > MAX_VALID_LEN)) {
gvt_err("len is not valid: len=%u valid_len=%u\n",cmd_len, valid_len);return -EFAULT;- }
for (i = 1; i < cmd_len; i += 2) { if (IS_BROADWELL(gvt->dev_priv) && s->ring_id != RCS0) { -- 2.17.1