Skip to content

Commit 291e4ba

Browse files
Zenghui Yudanvet
authored andcommitted
kselftests: dmabuf-heaps: Ensure the driver name is null-terminated
Even if a vgem device is configured in, we will skip the import_vgem_fd() test almost every time. TAP version 13 1..11 # Testing heap: system # ======================================= # Testing allocation and importing: ok 1 # SKIP Could not open vgem -1 The problem is that we use the DRM_IOCTL_VERSION ioctl to query the driver version information but leave the name field a non-null-terminated string. Terminate it properly to actually test against the vgem device. While at it, let's check the length of the driver name is exactly 4 bytes and return early otherwise (in case there is a name like "vgemfoo" that gets converted to "vgem\0" unexpectedly). Signed-off-by: Zenghui Yu <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent b6f7d98 commit 291e4ba

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ static int check_vgem(int fd)
2929
version.name = name;
3030

3131
ret = ioctl(fd, DRM_IOCTL_VERSION, &version);
32-
if (ret)
32+
if (ret || version.name_len != 4)
3333
return 0;
3434

35+
name[4] = '\0';
36+
3537
return !strcmp(name, "vgem");
3638
}
3739

0 commit comments

Comments
 (0)