Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf79cb91 authored by Chris Wilson's avatar Chris Wilson Committed by Dave Airlie
Browse files

drm: Use ENOENT consistently for the error return for an unmatched handle. 



This is consistent with trying to access a filename that not exist
within a directory which is a good analogy here. The main reason for the
change is that it is easy to confuse the error code of EBADF as an
performing an ioctl on an invalid file descriptor (rather than an
unknown object).

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a44d2f37

drivers/gpu/drm/drm_gem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ drm_gem_flink_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;





again:

again:

	if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {

	if (idr_pre_get(&dev->object_name_idr, GFP_KERNEL) == 0) {

drivers/gpu/drm/i915/i915_gem.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -456,7 +456,7 @@ i915_gem_pread_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);





	/* Bounds check source.

	/* Bounds check source.
@@ -919,7 +919,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);





	/* Bounds check destination.

	/* Bounds check destination.
@@ -1002,7 +1002,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);
@@ -1060,7 +1060,7 @@ i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data, 
	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL) {

	if (obj == NULL) {

		mutex_unlock(&dev->struct_mutex);

		mutex_unlock(&dev->struct_mutex);

		return -EBADF;

		return -ENOENT;

	}

	}





#if WATCH_BUF

#if WATCH_BUF
@@ -1099,7 +1099,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;





	offset = args->offset;

	offset = args->offset;
@@ -1373,7 +1373,7 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EBADF;

		return -ENOENT;





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);
@@ -3364,7 +3364,7 @@ i915_gem_object_pin_and_relocate(struct drm_gem_object *obj, 
						   reloc->target_handle);

						   reloc->target_handle);

		if (target_obj == NULL) {

		if (target_obj == NULL) {

			i915_gem_object_unpin(obj);

			i915_gem_object_unpin(obj);

			return -EBADF;

			return -ENOENT;

		}

		}

		target_obj_priv = to_intel_bo(target_obj);

		target_obj_priv = to_intel_bo(target_obj);
@@ -3781,7 +3781,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
				   exec_list[i].handle, i);

				   exec_list[i].handle, i);

			/* prevent error path from reading uninitialized data */

			/* prevent error path from reading uninitialized data */

			args->buffer_count = i + 1;

			args->buffer_count = i + 1;

			ret = -EBADF;

			ret = -ENOENT;

			goto err;

			goto err;

		}

		}
@@ -3791,7 +3791,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
				   object_list[i]);

				   object_list[i]);

			/* prevent error path from reading uninitialized data */

			/* prevent error path from reading uninitialized data */

			args->buffer_count = i + 1;

			args->buffer_count = i + 1;

			ret = -EBADF;

			ret = -EINVAL;

			goto err;

			goto err;

		}

		}

		obj_priv->in_execbuffer = true;

		obj_priv->in_execbuffer = true;
@@ -4265,7 +4265,7 @@ i915_gem_pin_ioctl(struct drm_device *dev, void *data, 
		DRM_ERROR("Bad handle in i915_gem_pin_ioctl(): %d\n",

		DRM_ERROR("Bad handle in i915_gem_pin_ioctl(): %d\n",

			  args->handle);

			  args->handle);

		mutex_unlock(&dev->struct_mutex);

		mutex_unlock(&dev->struct_mutex);

		return -EBADF;

		return -ENOENT;

	}

	}

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);
@@ -4321,7 +4321,7 @@ i915_gem_unpin_ioctl(struct drm_device *dev, void *data, 
		DRM_ERROR("Bad handle in i915_gem_unpin_ioctl(): %d\n",

		DRM_ERROR("Bad handle in i915_gem_unpin_ioctl(): %d\n",

			  args->handle);

			  args->handle);

		mutex_unlock(&dev->struct_mutex);

		mutex_unlock(&dev->struct_mutex);

		return -EBADF;

		return -ENOENT;

	}

	}





	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);
@@ -4355,7 +4355,7 @@ i915_gem_busy_ioctl(struct drm_device *dev, void *data, 
	if (obj == NULL) {

	if (obj == NULL) {

		DRM_ERROR("Bad handle in i915_gem_busy_ioctl(): %d\n",

		DRM_ERROR("Bad handle in i915_gem_busy_ioctl(): %d\n",

			  args->handle);

			  args->handle);

		return -EBADF;

		return -ENOENT;

	}

	}





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);
@@ -4408,7 +4408,7 @@ i915_gem_madvise_ioctl(struct drm_device *dev, void *data, 
	if (obj == NULL) {

	if (obj == NULL) {

		DRM_ERROR("Bad handle in i915_gem_madvise_ioctl(): %d\n",

		DRM_ERROR("Bad handle in i915_gem_madvise_ioctl(): %d\n",

			  args->handle);

			  args->handle);

		return -EBADF;

		return -ENOENT;

	}

	}





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/i915/i915_gem_tiling.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -275,7 +275,7 @@ i915_gem_set_tiling(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EINVAL;

		return -ENOENT;

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);





	if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {

	if (!i915_tiling_ok(dev, args->stride, obj->size, args->tiling_mode)) {
@@ -362,7 +362,7 @@ i915_gem_get_tiling(struct drm_device *dev, void *data, 




	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	obj = drm_gem_object_lookup(dev, file_priv, args->handle);

	if (obj == NULL)

	if (obj == NULL)

		return -EINVAL;

		return -ENOENT;

	obj_priv = to_intel_bo(obj);

	obj_priv = to_intel_bo(obj);





	mutex_lock(&dev->struct_mutex);

	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/nouveau/nouveau_gem.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, 
		if (!gem) {

		if (!gem) {

			NV_ERROR(dev, "Unknown handle 0x%08x\n", b->handle);

			NV_ERROR(dev, "Unknown handle 0x%08x\n", b->handle);

			validate_fini(op, NULL);

			validate_fini(op, NULL);

			return -EINVAL;

			return -ENOENT;

		}

		}

		nvbo = gem->driver_private;

		nvbo = gem->driver_private;
@@ -759,7 +759,7 @@ nouveau_gem_ioctl_cpu_prep(struct drm_device *dev, void *data, 




	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

	if (!gem)

		return ret;

		return -ENOENT;

	nvbo = nouveau_gem_object(gem);

	nvbo = nouveau_gem_object(gem);





	if (nvbo->cpu_filp) {

	if (nvbo->cpu_filp) {
@@ -797,7 +797,7 @@ nouveau_gem_ioctl_cpu_fini(struct drm_device *dev, void *data, 




	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

	if (!gem)

		return ret;

		return -ENOENT;

	nvbo = nouveau_gem_object(gem);

	nvbo = nouveau_gem_object(gem);





	if (nvbo->cpu_filp != file_priv)

	if (nvbo->cpu_filp != file_priv)
@@ -822,7 +822,7 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data, 




	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	gem = drm_gem_object_lookup(dev, file_priv, req->handle);

	if (!gem)

	if (!gem)

		return -EINVAL;

		return -ENOENT;





	ret = nouveau_gem_info(gem, req);

	ret = nouveau_gem_info(gem, req);

	drm_gem_object_unreference_unlocked(gem);

	drm_gem_object_unreference_unlocked(gem);

drivers/gpu/drm/nouveau/nv04_crtc.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -917,7 +917,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv, 




	gem = drm_gem_object_lookup(dev, file_priv, buffer_handle);

	gem = drm_gem_object_lookup(dev, file_priv, buffer_handle);

	if (!gem)

	if (!gem)

		return -EINVAL;

		return -ENOENT;

	cursor = nouveau_gem_object(gem);

	cursor = nouveau_gem_object(gem);





	ret = nouveau_bo_map(cursor);

	ret = nouveau_bo_map(cursor);