]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm: tests: Fix a buffer overflow in format_helper_test
authorDavid Gow <davidgow@google.com>
Wed, 19 Oct 2022 07:32:40 +0000 (15:32 +0800)
committerJavier Martinez Canillas <javierm@redhat.com>
Thu, 20 Oct 2022 07:56:05 +0000 (09:56 +0200)
The xrgb2101010 format conversion test (unlike for other formats) does
an endianness conversion on the results. However, it always converts
TEST_BUF_SIZE 32-bit integers, which results in reading from (and
writing to) more memory than in present in the result buffer. Instead,
use the buffer size, divided by sizeof(u32).

The issue could be reproduced with KASAN:
./tools/testing/kunit/kunit.py run --kunitconfig drivers/gpu/drm/tests \
--kconfig_add CONFIG_KASAN=y --kconfig_add CONFIG_KASAN_VMALLOC=y \
--kconfig_add CONFIG_KASAN_KUNIT_TEST=y \
drm_format_helper_test.*xrgb2101010

Reported-by: Linux Kernel Functional Testing <lkft@linaro.org>
Fixes: 5407cb573ec5 ("drm/format-helper: Add KUnit tests for drm_fb_xrgb8888_to_xrgb2101010()")
Signed-off-by: David Gow <davidgow@google.com>
Reviewed-by: Maíra Canal <mairacanal@riseup.net>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221019073239.3779180-1-davidgow@google.com
drivers/gpu/drm/tests/drm_format_helper_test.c

index 8d86c250c2ecb451c8d829d8505ddce8d6eef6dd..2191e57f22972b1dd2bf9553018be4d1a639a8e1 100644 (file)
@@ -438,7 +438,7 @@ static void drm_test_fb_xrgb8888_to_xrgb2101010(struct kunit *test)
        iosys_map_set_vaddr(&src, xrgb8888);
 
        drm_fb_xrgb8888_to_xrgb2101010(&dst, &result->dst_pitch, &src, &fb, &params->clip);
-       buf = le32buf_to_cpu(test, buf, TEST_BUF_SIZE);
+       buf = le32buf_to_cpu(test, buf, dst_size / sizeof(u32));
        KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0);
 }