diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2004-11-03 13:37:37 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2004-11-03 13:37:37 +0000 |
| commit | f08a01c0e21431e1b7990584ce2f61f0e711c093 (patch) | |
| tree | b3a19e50620295ce183799808908f647a52750be /shared-core/via_dma.c | |
| parent | 9409d8231c3be346ce7148275ce0ee86ec171716 (diff) | |
Fixed bug in via_dma.c. The code didn't check that the lock was held by the
caller. Just that it was held.
Diffstat (limited to 'shared-core/via_dma.c')
| -rw-r--r-- | shared-core/via_dma.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/shared-core/via_dma.c b/shared-core/via_dma.c index c8aad337..ee4a02ab 100644 --- a/shared-core/via_dma.c +++ b/shared-core/via_dma.c @@ -248,10 +248,7 @@ int via_flush_ioctl(DRM_IOCTL_ARGS) { DRM_DEVICE; - if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { - DRM_ERROR("via_flush_ioctl called without lock held\n"); - return DRM_ERR(EINVAL); - } + LOCK_TEST_WITH_RETURN( dev, filp ); return via_quiescent(dev); } @@ -262,16 +259,13 @@ int via_cmdbuffer(DRM_IOCTL_ARGS) drm_via_cmdbuffer_t cmdbuf; int ret; + LOCK_TEST_WITH_RETURN( dev, filp ); + DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t *) data, sizeof(cmdbuf)); DRM_DEBUG("via cmdbuffer, buf %p size %lu\n", cmdbuf.buf, cmdbuf.size); - if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { - DRM_ERROR("via_cmdbuffer called without lock held\n"); - return DRM_ERR(EINVAL); - } - ret = via_dispatch_cmdbuffer(dev, &cmdbuf); if (ret) { return ret; @@ -339,17 +333,14 @@ int via_pci_cmdbuffer(DRM_IOCTL_ARGS) drm_via_cmdbuffer_t cmdbuf; int ret; + LOCK_TEST_WITH_RETURN( dev, filp ); + DRM_COPY_FROM_USER_IOCTL(cmdbuf, (drm_via_cmdbuffer_t *) data, sizeof(cmdbuf)); DRM_DEBUG("via_pci_cmdbuffer, buf %p size %lu\n", cmdbuf.buf, cmdbuf.size); - if (!_DRM_LOCK_IS_HELD(dev->lock.hw_lock->lock)) { - DRM_ERROR("via_pci_cmdbuffer called without lock held\n"); - return DRM_ERR(EINVAL); - } - ret = via_dispatch_pci_cmdbuffer(dev, &cmdbuf); if (ret) { return ret; |