Skip to contentSkip to conversation

drm/amdgpu/psp: prevent page fault by checking write_frame address(v2) -v2: update the ring_buffer_end address

PATCH In review Evan Quan 2 participants 2 messages Oct 17, 2017 – Oct 18, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Evan Quan

author
#0 lore raw

PATCH 1/1 drm/amdgpu/psp: prevent page fault by checking write_frame address(v2) -v2: update the ring_buffer_end address

Change-Id If3b79428b32ffab57b4e75f9c20c2b2d7e600223
---
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 16 ++++++++++++++--
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c  | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +14 -2
index 77cab1f..7d31c74 100644
@@ -257,6 +257,9 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,
 	unsigned int psp_write_ptr_reg = 0;
 	struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
 	struct psp_ring *ring = &psp->km_ring;
+	struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
+	struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
+		ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
 	struct amdgpu_device *adev = psp->adev;
 	uint32_t ring_size_dw = ring->ring_size / 4;
 	uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
@@ -266,9 +269,18 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,
 
 	/* Update KM RB frame pointer to new frame */
 	if ((psp_write_ptr_reg % ring_size_dw) == 0)
-		write_frame = ring->ring_mem;
+		write_frame = ring_buffer_start;
 	else
-		write_frame = ring->ring_mem + (psp_write_ptr_reg / rb_frame_size_dw);
+		write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
+	/* Check invalid write_frame ptr address */
+	if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
+		DRM_ERROR("ring_buffer_start = %x; ring_buffer_end = %x; write_frame = %x\n",
+				ring_buffer_start,
+				ring_buffer_end,
+				write_frame);
+		DRM_ERROR("write_frame is pointing to address out of bounds\n");
+		return -EINVAL;
+	}
 
 	/* Initialize KM RB frame */
 	memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +14 -2
index bcbe30d..3f0eecf 100644
@@ -367,6 +367,9 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,
 	unsigned int psp_write_ptr_reg = 0;
 	struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
 	struct psp_ring *ring = &psp->km_ring;
+	struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
+	struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
+		ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
 	struct amdgpu_device *adev = psp->adev;
 	uint32_t ring_size_dw = ring->ring_size / 4;
 	uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
@@ -378,9 +381,18 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,
 	/* write_frame ptr increments by size of rb_frame in bytes */
 	/* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
 	if ((psp_write_ptr_reg % ring_size_dw) == 0)
-		write_frame = ring->ring_mem;
+		write_frame = ring_buffer_start;
 	else
-		write_frame = ring->ring_mem + (psp_write_ptr_reg / rb_frame_size_dw);
+		write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
+	/* Check invalid write_frame ptr address */
+	if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
+		DRM_ERROR("ring_buffer_start = %x; ring_buffer_end = %x; write_frame = %x\n",
+				ring_buffer_start,
+				ring_buffer_end,
+				write_frame);
+		DRM_ERROR("write_frame is pointing to address out of bounds\n");
+		return -EINVAL;
+	}
 
 	/* Initialize KM RB frame */
 	memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1508210815-24059-1-git-send-email-evan.quan-5C7GfCeVMHo@public.gmane.org

#2 lore raw
Quoted 2 lines · Evan Quan
Change-Id If3b79428b32ffab57b4e75f9c20c2b2d7e600223

Please include a better commit message. Something like:
Prevent a a possible buffer overflow when updating the ring buffer by bounds checking the command frame against the available space in the ring buffer.

Quoted 78 lines
---
 drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 16 ++++++++++++++--
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c  | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +14 -2
index 77cab1f..7d31c74 100644
@@ -257,6 +257,9 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,
        unsigned int psp_write_ptr_reg = 0;
        struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
        struct psp_ring *ring = &psp->km_ring;
+       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
+       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
+               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
        struct amdgpu_device *adev = psp->adev;
        uint32_t ring_size_dw = ring->ring_size / 4;
        uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
@@ -266,9 +269,18 @@ int psp_v10_0_cmd_submit(struct psp_context *psp,
 
        /* Update KM RB frame pointer to new frame */
        if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring->ring_mem;
+               write_frame = ring_buffer_start;
        else
-               write_frame = ring->ring_mem + (psp_write_ptr_reg / rb_frame_size_dw);
+               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
+       /* Check invalid write_frame ptr address */
+       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
+               DRM_ERROR("ring_buffer_start = %x; ring_buffer_end = %x; write_frame = %x\n",
+                               ring_buffer_start,
+                               ring_buffer_end,
+                               write_frame);
+               DRM_ERROR("write_frame is pointing to address out of bounds\n");
+               return -EINVAL;
+       }
 
        /* Initialize KM RB frame */
        memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +14 -3
index bcbe30d..3f0eecf 100644
@@ -367,6 +367,9 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,
        unsigned int psp_write_ptr_reg = 0;
        struct psp_gfx_rb_frame * write_frame = psp->km_ring.ring_mem;
        struct psp_ring *ring = &psp->km_ring;
+       struct psp_gfx_rb_frame *ring_buffer_start = ring->ring_mem;
+       struct psp_gfx_rb_frame *ring_buffer_end = ring_buffer_start +
+               ring->ring_size / sizeof(struct psp_gfx_rb_frame) - 1;
        struct amdgpu_device *adev = psp->adev;
        uint32_t ring_size_dw = ring->ring_size / 4;
        uint32_t rb_frame_size_dw = sizeof(struct psp_gfx_rb_frame) / 4;
@@ -378,9 +381,18 @@ int psp_v3_1_cmd_submit(struct psp_context *psp,
        /* write_frame ptr increments by size of rb_frame in bytes */
        /* psp_write_ptr_reg increments by size of rb_frame in DWORDs */
        if ((psp_write_ptr_reg % ring_size_dw) == 0)
-               write_frame = ring->ring_mem;
+               write_frame = ring_buffer_start;
        else
-               write_frame = ring->ring_mem + (psp_write_ptr_reg / rb_frame_size_dw);
+               write_frame = ring_buffer_start + (psp_write_ptr_reg / rb_frame_size_dw);
+       /* Check invalid write_frame ptr address */
+       if ((write_frame < ring_buffer_start) || (ring_buffer_end < write_frame)) {
+               DRM_ERROR("ring_buffer_start = %x; ring_buffer_end = %x; write_frame = %x\n",
+                               ring_buffer_start,
+                               ring_buffer_end,
+                               write_frame);
+               DRM_ERROR("write_frame is pointing to address out of bounds\n");
+               return -EINVAL;
+       }
 
        /* Initialize KM RB frame */
        memset(write_frame, 0, sizeof(struct psp_gfx_rb_frame));
--

2.7.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx