From: Ilija Hadzic <ihadzic@research.bell-labs.com> To: dri-devel@lists.freedesktop.org Subject: [PATCH 10/19] drm: only allow render node ioctls through control node Date: Thu, 12 Apr 2012 14:19:35 -0400 [thread overview] Message-ID: <1334254784-3200-11-git-send-email-ihadzic@research.bell-labs.com> (raw) In-Reply-To: <1334254784-3200-1-git-send-email-ihadzic@research.bell-labs.com> The render-node manipulation ioctls are supposed to be issued through control node only. Add a check and return -EPERM to user space if access is attempted through a node other than a control node. Signed-off-by: Ilija Hadzic <ihadzic@research.bell-labs.com> --- drivers/gpu/drm/drm_stub.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index d7ec39c..6629dd7 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c @@ -552,6 +552,10 @@ int drm_render_node_create_ioctl(struct drm_device *dev, void *data, int total_ids, i; uint32_t __user *ids_ptr; + /* allow access through control node only */ + if (file_priv->minor != dev->control) + return -EPERM; + /* trivial case: render node with no display resources */ if (args->num_crtc == 0 && args->num_encoder == 0 && args->num_connector == 0 && args->num_plane == 0) { @@ -603,6 +607,10 @@ int drm_render_node_remove_ioctl(struct drm_device *dev, void *data, struct drm_render_node_remove *args = data; int ret; + /* allow access through control node only */ + if (file_priv->minor != dev->control) + return -EPERM; + ret = drm_destroy_render_node(dev, args->node_minor_id); return ret; } -- 1.7.8.5
next prev parent reply other threads:[~2012-04-12 18:21 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-04-12 18:19 [RFC v2] Revive the work on render-nodes branch Ilija Hadzic 2012-04-12 18:19 ` [PATCH 01/19] drm: simplify dereferencing of node type Ilija Hadzic 2012-04-12 18:19 ` [PATCH 02/19] drm: track planes in drm_mode_group structure Ilija Hadzic 2012-04-12 18:19 ` [PATCH 03/19] drm: use drm_mode_group in drm_mode_getplane_res Ilija Hadzic 2012-04-12 18:19 ` [PATCH 04/19] drm: do not push inode down into drm_open_helper Ilija Hadzic 2012-04-12 18:19 ` [PATCH 05/19] drm: move dev_mapping to the minor node Ilija Hadzic 2012-04-20 10:04 ` Dave Airlie 2012-04-30 14:48 ` Ilija Hadzic 2012-04-30 16:39 ` Dave Airlie 2012-04-30 16:52 ` Ilija Hadzic 2012-04-30 17:53 ` Dave Airlie 2012-04-30 18:04 ` Dave Airlie 2012-05-15 20:48 ` Ilija Hadzic 2012-04-12 18:19 ` [PATCH 06/19] drm: add support for render nodes Ilija Hadzic 2012-04-12 18:19 ` [PATCH 07/19] drm: initial multiple nodes ioctl work Ilija Hadzic 2012-04-20 10:15 ` Dave Airlie 2012-04-12 18:19 ` [PATCH 08/19] drm: separate render node descriptor from minor Ilija Hadzic 2012-04-12 18:19 ` [PATCH 09/19] drm: cleanup render node ioctls Ilija Hadzic 2012-04-12 18:19 ` Ilija Hadzic [this message] 2012-04-12 18:19 ` [PATCH 11/19] drm: do not remove a render node in use Ilija Hadzic 2012-04-12 18:19 ` [PATCH 12/19] drm: allocate correct id_list size for a render node Ilija Hadzic 2012-04-12 18:19 ` [PATCH 13/19] drm: add drm_mode_group_fini function Ilija Hadzic 2012-04-12 18:19 ` [PATCH 14/19] drm: properly free id_list when a render node is removed Ilija Hadzic 2012-04-12 18:19 ` [PATCH 15/19] drm: call drm_mode_group_fini on primary node Ilija Hadzic 2012-04-12 18:19 ` [PATCH 16/19] drm: more elaborate check for resource count Ilija Hadzic 2012-04-12 18:19 ` [PATCH 17/19] drm: validate id list when creating a render node Ilija Hadzic 2012-04-12 18:19 ` [PATCH 18/19] drm: keep track of which node holds which resource Ilija Hadzic 2012-04-12 18:19 ` [PATCH 19/19] drm: hold mutex in critical sections of render-node code Ilija Hadzic 2012-04-12 18:55 ` [RFC v2] Revive the work on render-nodes branch Ville Syrjälä 2012-04-12 19:09 ` Ilija Hadzic 2012-04-20 10:20 ` Dave Airlie 2012-04-20 13:46 ` Daniel Vetter 2012-04-30 15:16 ` Ilija Hadzic 2012-04-30 19:01 ` Kristian Høgsberg
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1334254784-3200-11-git-send-email-ihadzic@research.bell-labs.com \ --to=ihadzic@research.bell-labs.com \ --cc=dri-devel@lists.freedesktop.org \ --subject='Re: [PATCH 10/19] drm: only allow render node ioctls through control node' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.