From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 24 Nov 2010 00:07:21 +0000 (+1000)
Subject: drm/nvc0: reject the notifier_alloc ioctl
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=587107b690f567690982fb504047e7b0a6590344;p=deliverable%2Flinux.git

drm/nvc0: reject the notifier_alloc ioctl

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c
index a050b7b69782..fe29d604b820 100644
--- a/drivers/gpu/drm/nouveau/nouveau_notifier.c
+++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c
@@ -164,10 +164,15 @@ int
 nouveau_ioctl_notifier_alloc(struct drm_device *dev, void *data,
 			     struct drm_file *file_priv)
 {
+	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct drm_nouveau_notifierobj_alloc *na = data;
 	struct nouveau_channel *chan;
 	int ret;
 
+	/* completely unnecessary for these chipsets... */
+	if (unlikely(dev_priv->card_type >= NV_C0))
+		return -EINVAL;
+
 	chan = nouveau_channel_get(dev, file_priv, na->channel);
 	if (IS_ERR(chan))
 		return PTR_ERR(chan);