[PATCH 1/7] device: prevent a NULL pointer dereference in __intel_peek_fd

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is not a big issue to return -1 since the only codepath that uses
it is for display purposes.

Caught by Klockwork.

Signed-off-by: Martin Peres <martin.peres@xxxxxxxxxxxxxxx>
---
 src/intel_device.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/intel_device.c b/src/intel_device.c
index 54c1443..35e652a 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -650,7 +650,10 @@ int __intel_peek_fd(ScrnInfoPtr scrn)
 	dev = intel_device(scrn);
 	assert(dev && dev->fd != -1);
 
-	return dev->fd;
+	if (!dev)
+		return -1;
+	else
+		return dev->fd;
 }
 
 int intel_has_render_node(struct intel_device *dev)
-- 
2.7.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx




[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]
  Powered by Linux