diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2005-08-12 14:19:33 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2005-08-12 14:19:33 +0000 |
| commit | cdf49e57329803709fe26cbc103c318bc9292ddb (patch) | |
| tree | aef46b9e511cf7d8f1a4a2014736bdd2937a7fbd /linux-core | |
| parent | 4931d785ed0bf9f75200ed530c4061efe2d24a63 (diff) | |
Reverting the previous via security-fix commit, since the assumption of
contexts registered with the callers filp was wrong.
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drmP.h | 1 | ||||
| -rw-r--r-- | linux-core/drm_context.c | 30 |
2 files changed, 0 insertions, 31 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 8fed5e72..2b4dbcf6 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -838,7 +838,6 @@ extern int drm_context_switch_complete(drm_device_t * dev, int new); extern int drm_ctxbitmap_init(drm_device_t * dev); extern void drm_ctxbitmap_cleanup(drm_device_t * dev); extern void drm_ctxbitmap_free(drm_device_t * dev, int ctx_handle); -extern int drm_check_context(drm_file_t *priv, drm_context_t handle); extern int drm_setsareactx(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg); diff --git a/linux-core/drm_context.c b/linux-core/drm_context.c index ce4b06ef..baa8437d 100644 --- a/linux-core/drm_context.c +++ b/linux-core/drm_context.c @@ -576,34 +576,4 @@ int drm_rmctx(struct inode *inode, struct file *filp, return 0; } -/** - * Check that a context is registered for a caller. - * - * \param priv file pointer private structure. - * \param handle context handle. - * \param arg user argument pointing to a drm_ctx structure. - * \return one if the context is registered with the file pointer. Zero otherwise. - */ - -int drm_check_context(drm_file_t *priv, drm_context_t handle) -{ - drm_device_t *dev = priv->head->dev; - int ret = 0; - - down(&dev->ctxlist_sem); - if (dev->ctxlist && !list_empty(&dev->ctxlist->head)) { - drm_ctx_list_t *pos, *n; - - list_for_each_entry_safe(pos, n, &dev->ctxlist->head, head) { - if (pos->handle == handle) { - ret = (pos->tag == priv); - break; - } - } - } - up(&dev->ctxlist_sem); - return ret; -} - -EXPORT_SYMBOL(drm_check_context); /*@}*/ |