diff options
| author | Chris Wilson | 2018-02-08 11:24:03 +0100 |
|---|---|---|
| committer | Rodrigo Vivi | 2018-02-13 08:34:55 +0100 |
| commit | 73b0fcd24ef1b8e20b7f6e6babcde540d96d0cb2 (patch) | |
| tree | 4d3e8b0d69ec7d4525d74f6177949b9a47f44b77 /drivers/gpu/drm/i915/i915_oa_cnl.c | |
| parent | drm/i915/perf: Fix compiler warning for string truncation (diff) | |
| download | kernel-qcow2-linux-73b0fcd24ef1b8e20b7f6e6babcde540d96d0cb2.tar.gz kernel-qcow2-linux-73b0fcd24ef1b8e20b7f6e6babcde540d96d0cb2.tar.xz kernel-qcow2-linux-73b0fcd24ef1b8e20b7f6e6babcde540d96d0cb2.zip | |
drm/i915/perf: Fix compiler warning for string truncation
drivers/gpu/drm/i915/i915_oa_cnl.c: In function ‘i915_perf_load_test_config_cnl’:
drivers/gpu/drm/i915/i915_oa_cnl.c:99:2: error: ‘strncpy’ output truncated before terminating nul copying 36 bytes from a string of the same length [-Werror=stringop-truncation]
v2: strlcpy
Fixes: 95690a02fb5d ("drm/i915/perf: enable perf support on CNL")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180208102403.5587-2-chris@chris-wilson.co.uk
(cherry picked from commit 020580ff8edd50e64ae1bf47e560c61e5e2f29fc)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_oa_cnl.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_oa_cnl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_oa_cnl.c b/drivers/gpu/drm/i915/i915_oa_cnl.c index ff0ac3627cc4..ba9140c87cc0 100644 --- a/drivers/gpu/drm/i915/i915_oa_cnl.c +++ b/drivers/gpu/drm/i915/i915_oa_cnl.c @@ -96,9 +96,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) void i915_perf_load_test_config_cnl(struct drm_i915_private *dev_priv) { - strncpy(dev_priv->perf.oa.test_config.uuid, + strlcpy(dev_priv->perf.oa.test_config.uuid, "db41edd4-d8e7-4730-ad11-b9a2d6833503", - UUID_STRING_LEN); + sizeof(dev_priv->perf.oa.test_config.uuid)); dev_priv->perf.oa.test_config.id = 1; dev_priv->perf.oa.test_config.mux_regs = mux_config_test_oa; |