]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
kselftests: dmabuf-heaps: Ensure the driver name is null-terminated
authorZenghui Yu <yuzenghui@huawei.com>
Mon, 29 Jul 2024 02:46:04 +0000 (10:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:11:38 +0000 (11:11 +0200)
[ Upstream commit 291e4baf70019f17a81b7b47aeb186b27d222159 ]

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 <yuzenghui@huawei.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20240729024604.2046-1-yuzenghui@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c

index 890a8236a8ba73008aea8354b9bfeba712cfef28..2809f9a25c43354483d121087d68f15444073778 100644 (file)
@@ -28,9 +28,11 @@ static int check_vgem(int fd)
        version.name = name;
 
        ret = ioctl(fd, DRM_IOCTL_VERSION, &version);
-       if (ret)
+       if (ret || version.name_len != 4)
                return 0;
 
+       name[4] = '\0';
+
        return !strcmp(name, "vgem");
 }