]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/oa: Disallow 0 OA property values
authorAshutosh Dixit <ashutosh.dixit@intel.com>
Fri, 12 Dec 2025 06:18:49 +0000 (22:18 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 8 Jan 2026 09:14:54 +0000 (10:14 +0100)
commit 3595114bc31d1eb5e1996164c901485c1ffac6f7 upstream.

An OA property value of 0 is invalid and will cause a NPD.

Reported-by: Peter Senna Tschudin <peter.senna@linux.intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6452
Fixes: cc4e6994d5a2 ("drm/xe/oa: Move functions up so they can be reused for config ioctl")
Cc: stable@vger.kernel.org
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: Harish Chegondi <harish.chegondi@intel.com>
Link: https://patch.msgid.link/20251212061850.1565459-3-ashutosh.dixit@intel.com
(cherry picked from commit 7a100e6ddcc47c1f6ba7a19402de86ce24790621)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/xe/xe_oa.c

index 7ec425e206a4472701b7f34ba90083bd78486022..3f142f95e5d4978998f0da76a9e7b91f908ab0d0 100644 (file)
@@ -1266,7 +1266,7 @@ static int xe_oa_user_ext_set_property(struct xe_oa *oa, enum xe_oa_user_extn_fr
                     ARRAY_SIZE(xe_oa_set_property_funcs_config));
 
        if (XE_IOCTL_DBG(oa->xe, ext.property >= ARRAY_SIZE(xe_oa_set_property_funcs_open)) ||
-           XE_IOCTL_DBG(oa->xe, ext.pad))
+           XE_IOCTL_DBG(oa->xe, !ext.property) || XE_IOCTL_DBG(oa->xe, ext.pad))
                return -EINVAL;
 
        idx = array_index_nospec(ext.property, ARRAY_SIZE(xe_oa_set_property_funcs_open));