diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:30:21 -0400 |
| commit | 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8 (patch) | |
| tree | 8f1f746f98707fb82bcec281ee8f65216eddae36 /drivers/char/drm/drm_drv.c | |
| parent | a1d5a8691f1b6c92491747bea3b778b184fa5837 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/fixmap
Diffstat (limited to 'drivers/char/drm/drm_drv.c')
| -rw-r--r-- | drivers/char/drm/drm_drv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/drm/drm_drv.c b/drivers/char/drm/drm_drv.c index fc54140551a7..564138714bb5 100644 --- a/drivers/char/drm/drm_drv.c +++ b/drivers/char/drm/drm_drv.c | |||
| @@ -470,17 +470,18 @@ int drm_ioctl(struct inode *inode, struct file *filp, | |||
| 470 | if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) && | 470 | if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) && |
| 471 | (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) | 471 | (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls)) |
| 472 | ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; | 472 | ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE]; |
| 473 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) | 473 | else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) { |
| 474 | ioctl = &drm_ioctls[nr]; | 474 | ioctl = &drm_ioctls[nr]; |
| 475 | else | 475 | cmd = ioctl->cmd; |
| 476 | } else | ||
| 476 | goto err_i1; | 477 | goto err_i1; |
| 477 | 478 | ||
| 479 | /* Do not trust userspace, use our own definition */ | ||
| 478 | func = ioctl->func; | 480 | func = ioctl->func; |
| 479 | /* is there a local override? */ | 481 | /* is there a local override? */ |
| 480 | if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl) | 482 | if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl) |
| 481 | func = dev->driver->dma_ioctl; | 483 | func = dev->driver->dma_ioctl; |
| 482 | 484 | ||
| 483 | |||
| 484 | if (!func) { | 485 | if (!func) { |
| 485 | DRM_DEBUG("no function\n"); | 486 | DRM_DEBUG("no function\n"); |
| 486 | retcode = -EINVAL; | 487 | retcode = -EINVAL; |