drm/amdgpu: fix double fetch in amdgpu_ras_debugfs_ctrl_parse_data()

Submitted by JingYi Hou on July 16, 2019, 11:11 a.m.

Details

Message ID 20190716111122.GA35069@ubuntu
State New
Headers show
Series "drm/amdgpu: fix double fetch in amdgpu_ras_debugfs_ctrl_parse_data()" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

JingYi Hou July 16, 2019, 11:11 a.m.
In amdgpu_ras_debugfs_ctrl_parse_data(), first fetch str from buf to
get op value, if op == -1 which means no command matched, fetch data
from buf again.

If change buf between two fetches may cause security problems or
unexpected behaivor. amdgpu_ras_debugfs_ctrl_parse_data() was called
by amdgpu_ras_debugfs_ctrl_write() and value of op was used later.

We should check whether data->op == -1 or not after second fetch. if
data->op != -1 means buf changed and should return -EINVAL.

Signed-off-by: JingYi Hou <houjingyi647@gmail.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++
 1 file changed, 3 insertions(+)

--
2.20.1

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 22bd21efe6b1..845e73e98cd7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -233,6 +233,9 @@  static int amdgpu_ras_debugfs_ctrl_parse_data(struct file *f,

 		if (copy_from_user(data, buf, sizeof(*data)))
 			return -EINVAL;
+
+		if(data->op != -1)
+			return -EINVAL;
 	}

 	return 0;