 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_ioctl.c,v 1.24 2022/10/15 15:19:28 riastradh Exp $	*/
+/*	$NetBSD: drm_ioctl.c,v 1.25 2024/04/21 03:02:51 riastradh Exp $	*/
 /*
  * Created: Fri Jan  8 09:01:26 1999 by faith@valinux.com
+ *
  * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
  * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
  * All Rights Reserved.
+ *
  * Author Rickard E. (Rik) Faith <faith@valinux.com>
  * Author Gareth Hughes <gareth@valinux.com>
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
 @@ -21,27 +21,27 @@
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.24 2022/10/15 15:19:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,v 1.25 2024/04/21 03:02:51 riastradh Exp $");
 #include <linux/export.h>
 #include <linux/nospec.h>
 #include <linux/pci.h>
 #include <linux/uaccess.h>
 #include <linux/capability.h>
 #ifdef __NetBSD__
 #include <sys/types.h>
 #include <sys/file.h>
 #endif
 #include <drm/drm_agpsupport.h>
 @@ -119,39 +119,55 @@ __KERNEL_RCSID(0, "$NetBSD: drm_ioctl.c,
+ *
  * \param inode device inode.
  * \param file_priv DRM file private.
  * \param cmd command.
  * \param arg user argument, pointing to a drm_unique structure.
  * \return zero on success or a negative number on failure.
+ *
  * Copies the bus id from drm_device::unique into user space.
  */
 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;
+	struct drm_master *master;
 	int ret;
-	mutex_lock(&master->dev->master_mutex);
+	mutex_lock(&dev->master_mutex);
-	if (u->unique_len >= master->unique_len) {
+	master = dev->master;
-		if (copy_to_user(u->unique, master->unique, master->unique_len)) {
+	if (master == NULL) {
-			mutex_unlock(&master->dev->master_mutex);
+		ret = -ENXIO;
-			return -EFAULT;
+		goto out;
+	}
 	/*
 	 * Copy out only if the user allocated enough space.  Either
 	 * way, on success, report the actual size -- so the user can
 	 * allocate enough space if they didn't before, or so they know
 	 * exactly how much we copied out.
 	 */
 	if (u->unique_len < master->unique_len) {
 		ret = 0;
 	} else {
 		ret = copy_to_user(u->unique, master->unique,
 		    master->unique_len);
 		if (ret)
 			goto out;
+	}
 	u->unique_len = master->unique_len;
 	mutex_unlock(&master->dev->master_mutex);
-	return 0;
+out:	mutex_unlock(&dev->master_mutex);
 	return ret;
+}
 static void
 drm_unset_busid(struct drm_device *dev,
 		struct drm_master *master)
+{
 	kfree(master->unique);
 	master->unique = NULL;
 	master->unique_len = 0;
+}
 static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
+{
 @@ -587,27 +603,27 @@ EXPORT_SYMBOL(drm_ioctl_permit);
 		.flags = _flags,		\
 		.name = #ioctl			\
+	}
 #if IS_ENABLED(CONFIG_DRM_LEGACY)
 #define DRM_LEGACY_IOCTL_DEF(ioctl, _func, _flags)  DRM_IOCTL_DEF(ioctl, _func, _flags)
 #else
 #define DRM_LEGACY_IOCTL_DEF(ioctl, _func, _flags) DRM_IOCTL_DEF(ioctl, drm_invalid_op, _flags)
 #endif
 /* Ioctl table */
 static const struct drm_ioctl_desc drm_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_RENDER_ALLOW),
-	DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
+	DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_LEGACY_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_legacy_getmap_ioctl, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_GET_CAP, drm_getcap, DRM_RENDER_ALLOW),
 	DRM_IOCTL_DEF(DRM_IOCTL_SET_CLIENT_CAP, drm_setclientcap, 0),
 	DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
 	DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_invalid_op, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 	DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),