gfx: hdmi: Bug fix for overflow buffer boundaries.

fix the overflow buffer boundaries while doing strncpy
Build warning fix

ISSUE: HSD-207051
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>

diff --git a/drivers/staging/mrst/drv/otm_hdmi/ipil/common/otm_ipil_main.c b/drivers/staging/mrst/drv/otm_hdmi/ipil/common/otm_ipil_main.c
index 60bb307..a8066ca 100644 (file)
--- a/drivers/staging/mrst/drv/otm_hdmi/ipil/common/otm_ipil_main.c
+++ b/drivers/staging/mrst/drv/otm_hdmi/ipil/common/otm_ipil_main.c
@@ -369,8 +369,8 @@ otm_hdmi_ret_t ipil_hdmi_crtc_mode_set_program_dspregs(hdmi_device_t *dev,
         * Frame buffer size may beyond active region in case of
         * panning mode.
         */
-       sprite_width = min(fb_width, adjusted_mode->width);
-       sprite_height = min(fb_height, adjusted_mode->height);
+       sprite_width = min_t(int, fb_width, adjusted_mode->width);
+       sprite_height = min_t(int, fb_height, adjusted_mode->height);
 
        switch (scalingtype) {
        case IPIL_TIMING_SCALE_NONE:

diff --git a/drivers/staging/mrst/drv/otm_hdmi/pil/common/otm_hdmi.c b/drivers/staging/mrst/drv/otm_hdmi/pil/common/otm_hdmi.c
index 1ecfd2e..da1bd2c 100644 (file)
--- a/drivers/staging/mrst/drv/otm_hdmi/pil/common/otm_hdmi.c
+++ b/drivers/staging/mrst/drv/otm_hdmi/pil/common/otm_hdmi.c
@@ -1860,9 +1860,9 @@ static otm_hdmi_ret_t __pd_attr_declare(otm_hdmi_attribute_t *table,
        if ((id < 0) || (id > OTM_HDMI_MAX_SUPPORTED_ATTRIBUTES))
                return  OTM_HDMI_ERR_FAILED;
 
-       if ((name != NULL) && (strlen(name) < OTM_HDMI_MAX_STRING_LENGTH))
-               strncpy(table[id].name, name, strlen(table[id].name));
-       else if (strlen(table[id].name) == 0)
+       if ((name != NULL) && (strlen(name) <= OTM_HDMI_MAX_STRING_LENGTH))
+               strcpy(table[id].name, name);
+       else
                LOG_ERROR("set default name\n");
                /* TODO: set default name */
 
@@ -1881,10 +1881,9 @@ static otm_hdmi_ret_t __pd_attr_declare(otm_hdmi_attribute_t *table,
                        break;
        case OTM_HDMI_ATTR_TYPE_STRING:
                        if ((value != NULL) &&
-                       strlen(value) < OTM_HDMI_MAX_STRING_LENGTH)
-                               strncpy(table[id].content.string.value,
-                                       (char *) value,
-                                       strlen(table[id].content.string.value));
+                       strlen(value) <= OTM_HDMI_MAX_STRING_LENGTH)
+                               strcpy(table[id].content.string.value,
+                                       (char *) value);
                        else
                                rc = OTM_HDMI_ERR_FAILED;
                        break;