public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Peter Antoine <peter.antoine@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: airlied@redhat.com, dri-devel@lists.freedesktop.org,
	daniel.vetter@ffwll.ch
Subject: [PATCH 1/5] drm: Kernel Crash in drm_unlock
Date: Thu, 23 Apr 2015 15:07:54 +0100	[thread overview]
Message-ID: <1429798078-18987-2-git-send-email-peter.antoine@intel.com> (raw)
In-Reply-To: <1429798078-18987-1-git-send-email-peter.antoine@intel.com>

This patch fixes a possible kernel crash when drm_unlock (DRM_IOCTL_UNLOCK)
is called by a application that has not had a lock created by it. This
crash can be caused by any application from all users.

Issue: VIZ-5485
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
---
 drivers/gpu/drm/drm_lock.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index f861361..070dd5d 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -159,6 +159,14 @@ int drm_legacy_unlock(struct drm_device *dev, void *data, struct drm_file *file_
 		return -EINVAL;
 	}
 
+	if (!master->lock.hw_lock) {
+		DRM_ERROR(
+			"Device has been unregistered. Hard exit. Process %d\n",
+			task_pid_nr(current));
+		send_sig(SIGTERM, current, 0);
+		return -EPERM;
+	}
+
 	if (drm_legacy_lock_free(&master->lock, lock->context)) {
 		/* FIXME: Should really bail out here. */
 	}
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-04-23 14:07 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-23 14:07 [PATCH 0/5] HW_LOCK Security Patches Peter Antoine
2015-04-23 14:07 ` Peter Antoine [this message]
2015-04-23 14:19   ` [Intel-gfx] [PATCH 1/5] drm: Kernel Crash in drm_unlock Chris Wilson
2015-04-23 14:34     ` Antoine, Peter
2015-04-23 14:39       ` [Intel-gfx] " Chris Wilson
2015-04-24  5:52         ` Antoine, Peter
2015-04-28  9:21           ` Dave Gordon
2015-04-28  9:52             ` chris
2015-05-04 13:52               ` Daniel Vetter
2015-05-05  6:37                 ` Antoine, Peter
2015-05-05  7:20                   ` Daniel Vetter
2015-04-28 14:56             ` Dave Gordon
2015-04-23 14:07 ` [PATCH 2/5] drm: Fixes unsafe deference in locks Peter Antoine
2015-04-23 14:21   ` [Intel-gfx] " Chris Wilson
2015-04-23 14:07 ` [PATCH 3/5] drm: Possible lock priority escalation Peter Antoine
2015-04-27 16:52   ` [Intel-gfx] " Ville Syrjälä
2015-05-04 13:56     ` Daniel Vetter
2015-05-05  6:45       ` Antoine, Peter
2015-05-05  7:23         ` [Intel-gfx] " Daniel Vetter
2015-04-23 14:07 ` [PATCH 4/5] drm: Make HW_LOCK access functions optional Peter Antoine
2015-04-27 17:03   ` Ville Syrjälä
2015-04-28  5:52     ` Antoine, Peter
2015-04-28 10:40       ` Ville Syrjälä
2015-04-28 11:29         ` Antoine, Peter
2015-04-28 13:08           ` Ville Syrjälä
2015-04-28 13:29             ` Antoine, Peter
2015-05-04 14:05               ` Daniel Vetter
2015-05-04 23:02                 ` Dave Airlie
2015-04-23 14:07 ` [PATCH 5/5] drm: Make Legacy Context " Peter Antoine
2015-04-23 19:01   ` shuang.he
2015-05-13  6:54 ` [PATCH v2 0/2] HW_LOCK kernel patched Peter Antoine
2015-05-13  6:54   ` [PATCH v2 1/2] drm: Make HW_LOCK access functions optional Peter Antoine
2015-05-13  7:14     ` Daniel Vetter
2015-05-13  7:24       ` Daniel Vetter
2015-05-13  6:54   ` [PATCH v2 2/2] drm: Make Legacy Context " Peter Antoine
2015-05-13  7:19     ` Daniel Vetter
2015-05-13  9:41       ` Ville Syrjälä
2015-05-15  5:58     ` shuang.he
2015-05-13  7:08   ` [PATCH v2 0/2] HW_LOCK kernel patched Daniel Vetter

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=1429798078-18987-2-git-send-email-peter.antoine@intel.com \
    --to=peter.antoine@intel.com \
    --cc=airlied@redhat.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox