Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49e43ef7 authored by Lionel Landwerlin's avatar Lionel Landwerlin
Browse files

drm/i915: ensure oa config uuid is null terminated 



Because dev_priv is 0-ed it's not currently an issue, but since we
have dev_priv->perf.oa.test_config.uuid size at uuid + 1, we could
just copy the null character.

v2: Use strlcpy instead of strncpy (Chris)

Signed-off-by: default avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171102121827.436-1-lionel.g.landwerlin@intel.com
parent 820c5bbb

drivers/gpu/drm/i915/i915_oa_bdw.c

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) 
void

i915_perf_load_test_config_bdw(struct drm_i915_private *dev_priv)

{

	strncpy(dev_priv->perf.oa.test_config.uuid,

	strlcpy(dev_priv->perf.oa.test_config.uuid,

		"d6de6f55-e526-4f79-a6a6-d7315c09044e",

		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;

drivers/gpu/drm/i915/i915_oa_bxt.c

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) 
void

i915_perf_load_test_config_bxt(struct drm_i915_private *dev_priv)

{

	strncpy(dev_priv->perf.oa.test_config.uuid,

	strlcpy(dev_priv->perf.oa.test_config.uuid,

		"5ee72f5c-092f-421e-8b70-225f7c3e9612",

		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;

drivers/gpu/drm/i915/i915_oa_cflgt2.c

+2 −2
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) 
void

i915_perf_load_test_config_cflgt2(struct drm_i915_private *dev_priv)

{

	strncpy(dev_priv->perf.oa.test_config.uuid,

	strlcpy(dev_priv->perf.oa.test_config.uuid,

		"74fb4902-d3d3-4237-9e90-cbdc68d0a446",

		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;

drivers/gpu/drm/i915/i915_oa_chv.c

+2 −2
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) 
void

i915_perf_load_test_config_chv(struct drm_i915_private *dev_priv)

{

	strncpy(dev_priv->perf.oa.test_config.uuid,

	strlcpy(dev_priv->perf.oa.test_config.uuid,

		"4a534b07-cba3-414d-8d60-874830e883aa",

		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;

drivers/gpu/drm/i915/i915_oa_glk.c

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ show_test_oa_id(struct device *kdev, struct device_attribute *attr, char *buf) 
void

i915_perf_load_test_config_glk(struct drm_i915_private *dev_priv)

{

	strncpy(dev_priv->perf.oa.test_config.uuid,

	strlcpy(dev_priv->perf.oa.test_config.uuid,

		"dd3fd789-e783-4204-8cd0-b671bbccb0cf",

		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;