drm/amdkfd: validate SVM ioctl nattr against buffer size
Subsystems (3)
PATCH v2 1/1 drm/amdkfd: validate SVM ioctl nattr against buffer size
Validate nattr field against the buffer size, preventing out-of-bounds buffer access via user-controlled attribute count.
Signed-off-by Alysa Liu <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 26 ++++++++++++++++++++++-- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 +++ 2 files changed, 27 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +24 -2
@@ -26,6 +26,7 @@#include <linux/err.h> #include <linux/fs.h> #include <linux/file.h> +#include <linux/overflow.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/uaccess.h>
@@ -1729,6 +1730,16 @@ static int kfd_ioctl_set_xnack_mode(struct file *filep,return r; } +static int kfd_ioctl_svm_validate (void *kdata,unsigned int usize) +{ +struct kfd_ioctl_svm_args *args = kdata; +size_t expected =struct_size (args, attrs, args->nattr); + +if (expected ==SIZE_MAX || usize < expected) +return -EINVAL ; +return 0 ; +} +static int kfd_ioctl_svm (struct file *filep,struct kfd_process *p,void *data) {struct kfd_ioctl_svm_args *args = data;
@@ -3411,7 +3422,11 @@ static int kfd_ioctl_profiler(struct file *filep, struct kfd_process *p, void *d#define AMDKFD_IOCTL_DEF (ioctl, _func, _flags) \ [_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, \ - .cmd_drv = 0, .name = #ioctl} + .validate = NULL, .cmd_drv = 0, .name = #ioctl} + +#define AMDKFD_IOCTL_DEF_V (ioctl, _func, _validate, _flags) \ + [_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, \ + .validate = _validate, .cmd_drv = 0, .name = #ioctl}/** Ioctl table */ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {
@@ -3508,7 +3523,8 @@ static const struct amdkfd_ioctl_desc amdkfd_ioctls[] = {AMDKFD_IOCTL_DEF (AMDKFD_IOC_SMI_EVENTS , kfd_ioctl_smi_events,0 ), -AMDKFD_IOCTL_DEF (AMDKFD_IOC_SVM , kfd_ioctl_svm,0 ), +AMDKFD_IOCTL_DEF_V (AMDKFD_IOC_SVM , kfd_ioctl_svm, + kfd_ioctl_svm_validate,0 ),AMDKFD_IOCTL_DEF (AMDKFD_IOC_SET_XNACK_MODE , kfd_ioctl_set_xnack_mode, 0),
@@ -3636,6 +3652,12 @@ static long kfd_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)memset (kdata,0 , usize); } +if (ioctl->validate) { + retcode = ioctl->validate (kdata, usize); +if (retcode) + goto err_i1; + } + retcode =func (filep, process, kdata);if (cmd &IOC_OUT )
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +3 -0
@@ -1056,10 +1056,13 @@ extern struct srcu_struct kfd_processes_srcu;typedef int amdkfd_ioctl_t (struct file *filep,struct kfd_process *p,void *data); +typedef int amdkfd_ioctl_validate_t (void *kdata,unsigned int usize); +struct amdkfd_ioctl_desc {unsigned int cmd;int flags;amdkfd_ioctl_t *func; +amdkfd_ioctl_validate_t *validate;unsigned int cmd_drv;const char *name; };
Signature · 1 line
2.34.1