]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915/selftest: Ensure string fits within name[]
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 3 Feb 2020 18:16:25 +0000 (18:16 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 4 Feb 2020 10:02:36 +0000 (10:02 +0000)
Shrink the strncpy bounds to ensure the NUL-terminator can fit within
the embedded array:

In file included from drivers/gpu/drm/i915/gem/i915_gem_context.c:2475:
drivers/gpu/drm/i915/gem/selftests/mock_context.c: In function ‘mock_context’:
drivers/gpu/drm/i915/gem/selftests/mock_context.c:40:3: error: ‘strncpy’ specified bound 24 equals destination size [-Werror=stringop-truncation]
   40 |   strncpy(ctx->name, name, sizeof(ctx->name));

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200203181625.589118-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gem/selftests/mock_context.c

index 7bad8fed42382a1ba346a0b3556a2ed1f559ceaf..81764289cf0dafa719bef698dac184b6f79c8bb5 100644 (file)
@@ -37,7 +37,7 @@ mock_context(struct drm_i915_private *i915,
        if (name) {
                struct i915_ppgtt *ppgtt;
 
-               strncpy(ctx->name, name, sizeof(ctx->name));
+               strncpy(ctx->name, name, sizeof(ctx->name) - 1);
 
                ppgtt = mock_ppgtt(i915, name);
                if (!ppgtt)