Attachment 144522 Details for Bug 110903 – amdgpu: Compare DRM node type as well in fd_compare

[patch] amdgpu: Compare DRM node type as well in fd_compare

0001-amdgpu-Compare-DRM-node-type-as-well-in-fd_compare.patch (text/plain), 1.34 KB, created by Michel Dänzer on 2019-06-12 16:01:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2019-06-12 16:01:10 UTC

Size: 1.34 KB

patch

obsolete

>From 1e3395a626a38727f3b1f76e4648c229411840ae Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Wed, 12 Jun 2019 17:58:50 +0200
>Subject: [PATCH libdrm] amdgpu: Compare DRM node type as well in fd_compare
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Re-using a device for a node type different from the one passed in can
>break.
>
>Bugzilla: https://bugs.freedesktop.org/110903
>Signed-off-by: Michel DÃ¤nzer <michel.daenzer@amd.com>
>---
> amdgpu/amdgpu_device.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c
>index 362494b1..827d392b 100644
>--- a/amdgpu/amdgpu_device.c
>+++ b/amdgpu/amdgpu_device.c
>@@ -50,9 +50,11 @@ static int fd_compare(int fd1, int fd2)
> {
> 	char *name1 = drmGetPrimaryDeviceNameFromFd(fd1);
> 	char *name2 = drmGetPrimaryDeviceNameFromFd(fd2);
>+	int type1 = drmGetNodeTypeFromFd(fd1);
>+	int type2 = drmGetNodeTypeFromFd(fd2);
> 	int result;
> 
>-	if (name1 == NULL || name2 == NULL) {
>+	if (name1 == NULL || name2 == NULL || type1 == -1 || type2 == -1) {
> 		free(name1);
> 		free(name2);
> 		return 0;
>@@ -62,7 +64,10 @@ static int fd_compare(int fd1, int fd2)
> 	free(name1);
> 	free(name2);
> 
>-	return result;
>+	if (result)
>+		return result;
>+
>+	return type1 != type2;
> }
> 
> /**
>-- 
>2.20.1
>

Actions: View | Splinter Review

Attachments on bug 110903: 144518 | 144519 | 144522

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.