diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-30 19:30:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-30 19:30:05 -0700 |
| commit | fc9558666f9aceb5482bf3ceb61db7c3536d1d56 (patch) | |
| tree | 2eb04b43b94282e60697ef5701c2ca331a831137 | |
| parent | b01b33489fdfcaec7e3c406875cd4c89c31d8694 (diff) | |
| parent | 1f1075f3127e456a1bd90dc6a0315603c0e56f70 (diff) | |
Merge "drm/msm/sde: count null character for blob length"
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_crtc.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_kms.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_crtc.c b/drivers/gpu/drm/msm/sde/sde_crtc.c index 2a5127800313..a0417a0dd12e 100644 --- a/drivers/gpu/drm/msm/sde/sde_crtc.c +++ b/drivers/gpu/drm/msm/sde/sde_crtc.c @@ -1597,7 +1597,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, sde_kms_info_add_keyint(info, "max_mdp_clk", sde_kms->perf.max_core_clk_rate); msm_property_set_blob(&sde_crtc->property_info, &sde_crtc->blob_info, - info->data, info->len, CRTC_PROP_INFO); + info->data, SDE_KMS_INFO_DATALEN(info), CRTC_PROP_INFO); kfree(info); } diff --git a/drivers/gpu/drm/msm/sde/sde_kms.h b/drivers/gpu/drm/msm/sde/sde_kms.h index 88ec4753a8a7..dee16d119d47 100644 --- a/drivers/gpu/drm/msm/sde/sde_kms.h +++ b/drivers/gpu/drm/msm/sde/sde_kms.h @@ -282,10 +282,12 @@ struct sde_kms_info { /** * SDE_KMS_INFO_DATALEN - Macro for accessing sde_kms_info data length + * it adds an extra character length to count null. * @S: Pointer to sde_kms_info structure * Returns: Size of available byte data */ -#define SDE_KMS_INFO_DATALEN(S) ((S) ? ((struct sde_kms_info *)(S))->len : 0) +#define SDE_KMS_INFO_DATALEN(S) ((S) ? ((struct sde_kms_info *)(S))->len + 1 \ + : 0) /** * sde_kms_info_reset - reset sde_kms_info structure |