diff options
| author | Eric Anholt <eric@anholt.net> | 2007-11-22 18:46:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 15:09:39 +1000 |
| commit | b018fcdaa5e8b4eabb8cffda687d00004a3c4785 (patch) | |
| tree | 63772cad6f990cd3b0fb81e3329fa7b625dfa656 /drivers/char/drm | |
| parent | 3260f9fdfee9d5b4135f40943dc0bd0733b7394e (diff) | |
| download | op-kernel-dev-b018fcdaa5e8b4eabb8cffda687d00004a3c4785.zip op-kernel-dev-b018fcdaa5e8b4eabb8cffda687d00004a3c4785.tar.gz | |
drm: Make DRM_IOCTL_GET_CLIENT return EINVAL when it can't find client #idx.
Fixes the getclient test and dritest -c.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
| -rw-r--r-- | drivers/char/drm/drm_ioctl.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c index b4d86a3..16829fb 100644 --- a/drivers/char/drm/drm_ioctl.c +++ b/drivers/char/drm/drm_ioctl.c @@ -235,25 +235,22 @@ int drm_getclient(struct drm_device *dev, void *data, idx = client->idx; mutex_lock(&dev->struct_mutex); - if (list_empty(&dev->filelist)) { - mutex_unlock(&dev->struct_mutex); - return -EINVAL; - } - i = 0; list_for_each_entry(pt, &dev->filelist, lhead) { - if (i++ >= idx) - break; + if (i++ >= idx) { + client->auth = pt->authenticated; + client->pid = pt->pid; + client->uid = pt->uid; + client->magic = pt->magic; + client->iocs = pt->ioctl_count; + mutex_unlock(&dev->struct_mutex); + + return 0; + } } - - client->auth = pt->authenticated; - client->pid = pt->pid; - client->uid = pt->uid; - client->magic = pt->magic; - client->iocs = pt->ioctl_count; mutex_unlock(&dev->struct_mutex); - return 0; + return -EINVAL; } /** |
