1 files changed, 34 insertions, 27 deletions

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 16829fb3089d..1fad76289e66 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -53,12 +53,13 @@ int drm_getunique(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
         struct drm_unique *u = data;
+        struct drm_master *master = file_priv->master;
 
-        if (u->unique_len >= dev->unique_len) {
-                if (copy_to_user(u->unique, dev->unique, dev->unique_len))
+        if (u->unique_len >= master->unique_len) {
+                if (copy_to_user(u->unique, master->unique, master->unique_len))
                         return -EFAULT;
         }
-        u->unique_len = dev->unique_len;
+        u->unique_len = master->unique_len;
 
         return 0;
 }
@@ -81,36 +82,38 @@ int drm_setunique(struct drm_device *dev, void *data,
                   struct drm_file *file_priv)
 {
         struct drm_unique *u = data;
+        struct drm_master *master = file_priv->master;
         int domain, bus, slot, func, ret;
 
-        if (dev->unique_len || dev->unique)
+        if (master->unique_len || master->unique)
                 return -EBUSY;
 
         if (!u->unique_len || u->unique_len > 1024)
                 return -EINVAL;
 
-        dev->unique_len = u->unique_len;
-        dev->unique = drm_alloc(u->unique_len + 1, DRM_MEM_DRIVER);
-        if (!dev->unique)
+        master->unique_len = u->unique_len;
+        master->unique_size = u->unique_len + 1;
+        master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER);
+        if (!master->unique)
                 return -ENOMEM;
-        if (copy_from_user(dev->unique, u->unique, dev->unique_len))
+        if (copy_from_user(master->unique, u->unique, master->unique_len))
                 return -EFAULT;
 
-        dev->unique[dev->unique_len] = '\0';
+        master->unique[master->unique_len] = '\0';
 
         dev->devname =
             drm_alloc(strlen(dev->driver->pci_driver.name) +
-                      strlen(dev->unique) + 2, DRM_MEM_DRIVER);
+                      strlen(master->unique) + 2, DRM_MEM_DRIVER);
         if (!dev->devname)
                 return -ENOMEM;
 
         sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name,
-                dev->unique);
+                master->unique);
 
         /* Return error if the busid submitted doesn't match the device's actual
          * busid.
          */
-        ret = sscanf(dev->unique, "PCI:%d:%d:%d", &bus, &slot, &func);
+        ret = sscanf(master->unique, "PCI:%d:%d:%d", &bus, &slot, &func);
         if (ret != 3)
                 return -EINVAL;
         domain = bus >> 8;
@@ -125,34 +128,38 @@ int drm_setunique(struct drm_device *dev, void *data,
         return 0;
 }
 
-static int drm_set_busid(struct drm_device * dev)
+static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
 {
+        struct drm_master *master = file_priv->master;
         int len;
 
-        if (dev->unique != NULL)
-                return 0;
+        if (master->unique != NULL)
+                return -EBUSY;
 
-        dev->unique_len = 40;
-        dev->unique = drm_alloc(dev->unique_len + 1, DRM_MEM_DRIVER);
-        if (dev->unique == NULL)
+        master->unique_len = 40;
+        master->unique_size = master->unique_len;
+        master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER);
+        if (master->unique == NULL)
                 return -ENOMEM;
 
-        len = snprintf(dev->unique, dev->unique_len, "pci:%04x:%02x:%02x.%d",
-                       drm_get_pci_domain(dev), dev->pdev->bus->number,
+        len = snprintf(master->unique, master->unique_len, "pci:%04x:%02x:%02x.%d",
+                       drm_get_pci_domain(dev),
+                       dev->pdev->bus->number,
                        PCI_SLOT(dev->pdev->devfn),
                        PCI_FUNC(dev->pdev->devfn));
-
-        if (len > dev->unique_len)
-                DRM_ERROR("Unique buffer overflowed\n");
+        if (len >= master->unique_len)
+                DRM_ERROR("buffer overflow");
+        else
+                master->unique_len = len;
 
         dev->devname =
-            drm_alloc(strlen(dev->driver->pci_driver.name) + dev->unique_len +
+            drm_alloc(strlen(dev->driver->pci_driver.name) + master->unique_len +
                       2, DRM_MEM_DRIVER);
         if (dev->devname == NULL)
                 return -ENOMEM;
 
         sprintf(dev->devname, "%s@%s", dev->driver->pci_driver.name,
-                dev->unique);
+                master->unique);
 
         return 0;
 }
@@ -276,7 +283,7 @@ int drm_getstats(struct drm_device *dev, void *data,
         for (i = 0; i < dev->counters; i++) {
                 if (dev->types[i] == _DRM_STAT_LOCK)
                         stats->data[i].value =
-                            (dev->lock.hw_lock ? dev->lock.hw_lock->lock : 0);
+                            (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
                 else
                         stats->data[i].value = atomic_read(&dev->counts[i]);
                 stats->data[i].type = dev->types[i];
@@ -318,7 +325,7 @@ int drm_setversion(struct drm_device *dev, void *data, struct drm_file *file_pri
                         /*
                          * Version 1.1 includes tying of DRM to specific device
                          */
-                        drm_set_busid(dev);
+                        drm_set_busid(dev, file_priv);
                 }
         }