Commit 2a50b4d5 authored by Dave Airlie's avatar Dave Airlie Committed by David Airlie

gamma_dma_priority and gamma_dma_send_buffers both deref d->send_indices

and/or d->send_sizes.  When these functions are called from gamma_dma,
these pointers are user pointers and are thus not safe to deref.  This patch
copies over the pointers inside gamma_dma_priority and
gamma_dma_send_buffers.
Submitted-by: default avatarRobert T. Johnson <rtjohnso@eecs.berkeley.edu>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 3cab729f
...@@ -346,6 +346,9 @@ static int gamma_dma_priority(struct file *filp, ...@@ -346,6 +346,9 @@ static int gamma_dma_priority(struct file *filp,
drm_buf_t *buf; drm_buf_t *buf;
drm_buf_t *last_buf = NULL; drm_buf_t *last_buf = NULL;
drm_device_dma_t *dma = dev->dma; drm_device_dma_t *dma = dev->dma;
int *send_indices = NULL;
int *send_sizes = NULL;
DECLARE_WAITQUEUE(entry, current); DECLARE_WAITQUEUE(entry, current);
/* Turn off interrupt handling */ /* Turn off interrupt handling */
...@@ -365,11 +368,31 @@ static int gamma_dma_priority(struct file *filp, ...@@ -365,11 +368,31 @@ static int gamma_dma_priority(struct file *filp,
++must_free; ++must_free;
} }
send_indices = DRM(alloc)(d->send_count * sizeof(*send_indices),
DRM_MEM_DRIVER);
if (send_indices == NULL)
return -ENOMEM;
if (copy_from_user(send_indices, d->send_indices,
d->send_count * sizeof(*send_indices))) {
retcode = -EFAULT;
goto cleanup;
}
send_sizes = DRM(alloc)(d->send_count * sizeof(*send_sizes),
DRM_MEM_DRIVER);
if (send_sizes == NULL)
return -ENOMEM;
if (copy_from_user(send_sizes, d->send_sizes,
d->send_count * sizeof(*send_sizes))) {
retcode = -EFAULT;
goto cleanup;
}
for (i = 0; i < d->send_count; i++) { for (i = 0; i < d->send_count; i++) {
idx = d->send_indices[i]; idx = send_indices[i];
if (idx < 0 || idx >= dma->buf_count) { if (idx < 0 || idx >= dma->buf_count) {
DRM_ERROR("Index %d (of %d max)\n", DRM_ERROR("Index %d (of %d max)\n",
d->send_indices[i], dma->buf_count - 1); send_indices[i], dma->buf_count - 1);
continue; continue;
} }
buf = dma->buflist[ idx ]; buf = dma->buflist[ idx ];
...@@ -391,7 +414,7 @@ static int gamma_dma_priority(struct file *filp, ...@@ -391,7 +414,7 @@ static int gamma_dma_priority(struct file *filp,
process closes the /dev/drm? handle, so process closes the /dev/drm? handle, so
it can't also be doing DMA. */ it can't also be doing DMA. */
buf->list = DRM_LIST_PRIO; buf->list = DRM_LIST_PRIO;
buf->used = d->send_sizes[i]; buf->used = send_sizes[i];
buf->context = d->context; buf->context = d->context;
buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED; buf->while_locked = d->flags & _DRM_DMA_WHILE_LOCKED;
address = (unsigned long)buf->address; address = (unsigned long)buf->address;
...@@ -402,14 +425,14 @@ static int gamma_dma_priority(struct file *filp, ...@@ -402,14 +425,14 @@ static int gamma_dma_priority(struct file *filp,
if (buf->pending) { if (buf->pending) {
DRM_ERROR("Sending pending buffer:" DRM_ERROR("Sending pending buffer:"
" buffer %d, offset %d\n", " buffer %d, offset %d\n",
d->send_indices[i], i); send_indices[i], i);
retcode = -EINVAL; retcode = -EINVAL;
goto cleanup; goto cleanup;
} }
if (buf->waiting) { if (buf->waiting) {
DRM_ERROR("Sending waiting buffer:" DRM_ERROR("Sending waiting buffer:"
" buffer %d, offset %d\n", " buffer %d, offset %d\n",
d->send_indices[i], i); send_indices[i], i);
retcode = -EINVAL; retcode = -EINVAL;
goto cleanup; goto cleanup;
} }
...@@ -458,6 +481,12 @@ static int gamma_dma_priority(struct file *filp, ...@@ -458,6 +481,12 @@ static int gamma_dma_priority(struct file *filp,
gamma_dma_ready(dev); gamma_dma_ready(dev);
gamma_free_buffer(dev, last_buf); gamma_free_buffer(dev, last_buf);
} }
if (send_indices)
DRM(free)(send_indices, d->send_count * sizeof(*send_indices),
DRM_MEM_DRIVER);
if (send_sizes)
DRM(free)(send_sizes, d->send_count * sizeof(*send_sizes),
DRM_MEM_DRIVER);
if (must_free && !dev->context_flag) { if (must_free && !dev->context_flag) {
if (gamma_lock_free(dev, &dev->lock.hw_lock->lock, if (gamma_lock_free(dev, &dev->lock.hw_lock->lock,
...@@ -476,9 +505,13 @@ static int gamma_dma_send_buffers(struct file *filp, ...@@ -476,9 +505,13 @@ static int gamma_dma_send_buffers(struct file *filp,
drm_buf_t *last_buf = NULL; drm_buf_t *last_buf = NULL;
int retcode = 0; int retcode = 0;
drm_device_dma_t *dma = dev->dma; drm_device_dma_t *dma = dev->dma;
int send_index;
if (get_user(send_index, &d->send_indices[d->send_count-1]))
return -EFAULT;
if (d->flags & _DRM_DMA_BLOCK) { if (d->flags & _DRM_DMA_BLOCK) {
last_buf = dma->buflist[d->send_indices[d->send_count-1]]; last_buf = dma->buflist[send_index];
add_wait_queue(&last_buf->dma_wait, &entry); add_wait_queue(&last_buf->dma_wait, &entry);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment