Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Nirmoy Das <nirmoy.das@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Nirmoy Das <nirmoy.das@intel.com>, Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH 1/3] drm/xe: Fix out-of-bounds warning in vm_bind_ioctl_check_args
Date: Thu, 14 Mar 2024 10:54:40 +0100	[thread overview]
Message-ID: <20240314095442.32153-1-nirmoy.das@intel.com> (raw)

Modify how bind_ops is assigned and used within the for loop to
accommodate both array and single bind scenarios which should prevent
out-of-bounds access warning from static code analysis tool.

Cc: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/xe/xe_vm.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index cbb9b8935c90..0b742d8d82a5 100644
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -2839,15 +2839,16 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe,
 	}
 
 	for (i = 0; i < args->num_binds; ++i) {
-		u64 range = (*bind_ops)[i].range;
-		u64 addr = (*bind_ops)[i].addr;
-		u32 op = (*bind_ops)[i].op;
-		u32 flags = (*bind_ops)[i].flags;
-		u32 obj = (*bind_ops)[i].obj;
-		u64 obj_offset = (*bind_ops)[i].obj_offset;
-		u32 prefetch_region = (*bind_ops)[i].prefetch_mem_region_instance;
+		struct drm_xe_vm_bind_op *cur_ops = &(*bind_ops)[i];
+		u64 range = cur_ops->range;
+		u64 addr = cur_ops->addr;
+		u32 op = cur_ops->op;
+		u32 flags = cur_ops->flags;
+		u32 obj = cur_ops->obj;
+		u64 obj_offset = cur_ops->obj_offset;
+		u32 prefetch_region = cur_ops->prefetch_mem_region_instance;
 		bool is_null = flags & DRM_XE_VM_BIND_FLAG_NULL;
-		u16 pat_index = (*bind_ops)[i].pat_index;
+		u16 pat_index = cur_ops->pat_index;
 		u16 coh_mode;
 
 		if (XE_IOCTL_DBG(xe, pat_index >= xe->pat.n_entries)) {
@@ -2856,7 +2857,7 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe,
 		}
 
 		pat_index = array_index_nospec(pat_index, xe->pat.n_entries);
-		(*bind_ops)[i].pat_index = pat_index;
+		cur_ops->pat_index = pat_index;
 		coh_mode = xe_pat_index_get_coh_mode(xe, pat_index);
 		if (XE_IOCTL_DBG(xe, !coh_mode)) { /* hw reserved */
 			err = -EINVAL;
-- 
2.42.0


             reply	other threads:[~2024-03-14 10:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-14  9:54 Nirmoy Das [this message]
2024-03-14  9:54 ` [PATCH 2/3] drm/xe: Fix potential integer overflow in page size calculation Nirmoy Das
2024-03-14 10:24   ` Matthew Auld
2024-03-14  9:54 ` [PATCH 3/3] drm/xe: Warn on NULL job when user fence used in xe_sync_entry_signal Nirmoy Das
2024-03-14 10:53   ` Matthew Auld
2024-03-16  1:28     ` Matthew Brost
2024-03-18  9:27       ` Nirmoy Das
2024-03-14 10:15 ` ✓ CI.Patch_applied: success for series starting with [1/3] drm/xe: Fix out-of-bounds warning in vm_bind_ioctl_check_args Patchwork
2024-03-14 10:15 ` ✓ CI.checkpatch: " Patchwork
2024-03-14 10:20 ` ✓ CI.KUnit: " Patchwork
2024-03-14 10:30 ` ✓ CI.Build: " Patchwork
2024-03-14 10:36 ` ✓ CI.Hooks: " Patchwork
2024-03-14 10:37 ` ✓ CI.checksparse: " Patchwork
2024-03-14 10:55 ` [PATCH 1/3] " Matthew Auld
2024-03-16  1:29   ` Matthew Brost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240314095442.32153-1-nirmoy.das@intel.com \
    --to=nirmoy.das@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=matthew.auld@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox