All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH v2] i915/perf: Fix NULL deref bugs with drm_dbg() calls
@ 2023-10-27 17:28 ` Harshit Mogalapalli
  0 siblings, 0 replies; 11+ messages in thread
From: Harshit Mogalapalli @ 2023-10-27 17:28 UTC (permalink / raw)
  To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin,
	David Airlie, Daniel Vetter, Andrzej Hajda, Umesh Nerlige Ramappa,
	Matt Roper, Lionel Landwerlin, intel-gfx, dri-devel, linux-kernel
  Cc: harshit.m.mogalapalli, kernel-janitors, error27, dan.carpenter,
	Tvrtko Ursulin

When i915 perf interface is not available dereferencing it will lead to
NULL dereferences.

As returning -ENOTSUPP is pretty clear return when perf interface is not
available.

Fixes: 2fec539112e8 ("i915/perf: Replace DRM_DEBUG with driver specific drm_dbg call")
Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
---
v1 --> v2: Remove the debug calls as they don't add much value and
-ENOTSUPP is a good enough return value.
---
 drivers/gpu/drm/i915/i915_perf.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 2f3ecd7d4804..7b1c8de2f9cb 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -4227,11 +4227,8 @@ int i915_perf_open_ioctl(struct drm_device *dev, void *data,
 	u32 known_open_flags;
 	int ret;
 
-	if (!perf->i915) {
-		drm_dbg(&perf->i915->drm,
-			"i915 perf interface not available for this system\n");
+	if (!perf->i915)
 		return -ENOTSUPP;
-	}
 
 	known_open_flags = I915_PERF_FLAG_FD_CLOEXEC |
 			   I915_PERF_FLAG_FD_NONBLOCK |
@@ -4607,11 +4604,8 @@ int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
 	struct i915_oa_reg *regs;
 	int err, id;
 
-	if (!perf->i915) {
-		drm_dbg(&perf->i915->drm,
-			"i915 perf interface not available for this system\n");
+	if (!perf->i915)
 		return -ENOTSUPP;
-	}
 
 	if (!perf->metrics_kobj) {
 		drm_dbg(&perf->i915->drm,
@@ -4773,11 +4767,8 @@ int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
 	struct i915_oa_config *oa_config;
 	int ret;
 
-	if (!perf->i915) {
-		drm_dbg(&perf->i915->drm,
-			"i915 perf interface not available for this system\n");
+	if (!perf->i915)
 		return -ENOTSUPP;
-	}
 
 	if (i915_perf_stream_paranoid && !perfmon_capable()) {
 		drm_dbg(&perf->i915->drm,
-- 
2.39.3


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2023-10-30 21:32 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-27 17:28 [Intel-gfx] [PATCH v2] i915/perf: Fix NULL deref bugs with drm_dbg() calls Harshit Mogalapalli
2023-10-27 17:28 ` Harshit Mogalapalli
2023-10-27 17:28 ` Harshit Mogalapalli
2023-10-27 17:38 ` [Intel-gfx] " Tvrtko Ursulin
2023-10-27 17:38   ` Tvrtko Ursulin
2023-10-27 17:38   ` Tvrtko Ursulin
2023-10-30 12:47   ` [Intel-gfx] " Tvrtko Ursulin
2023-10-30 12:47     ` Tvrtko Ursulin
2023-10-30 12:47     ` Tvrtko Ursulin
2023-10-27 23:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success for i915/perf: Fix NULL deref bugs with drm_dbg() calls (rev2) Patchwork
2023-10-30 21:32 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.