drm/i915/gvt: Fix cmd length check for MI_ATOMIC
authorZhenyu Wang <zhenyuw@linux.intel.com>
Thu, 21 Nov 2019 05:57:45 +0000 (13:57 +0800)
committerZhenyu Wang <zhenyuw@linux.intel.com>
Mon, 2 Dec 2019 03:06:49 +0000 (11:06 +0800)
Correct valid command length check for MI_ATOMIC, need to check inline
data available field instead of operand data length for whole command.

Fixes: 00a33be40634 ("drm/i915/gvt: Add valid length check for MI variable commands")
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Gao Fred <fred.gao@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
drivers/gpu/drm/i915/gvt/cmd_parser.c

index 6a3ac8cde95d667ee20540044a351d88c5b83d88..21a176cd8acc9c591b1394d6edc285a9ae2baff7 100644 (file)
@@ -1599,9 +1599,9 @@ static int cmd_handler_mi_op_2f(struct parser_exec_state *s)
        if (!(cmd_val(s, 0) & (1 << 22)))
                return ret;
 
-       /* check if QWORD */
-       if (DWORD_FIELD(0, 20, 19) == 1)
-               valid_len += 8;
+       /* check inline data */
+       if (cmd_val(s, 0) & BIT(18))
+               valid_len = CMD_LEN(9);
        ret = gvt_check_valid_cmd_length(cmd_length(s),
                        valid_len);
        if (ret)