Revert "Graphic: Critical Klocwork issues for ICS kernel"

BZ: 23906

This reverts commit dbdd38c317a0754ea95129e974780c952028bb61

Change-Id: Ia84b6aeffdaf8e1ff7d324ebb6b7d5df74bd8190
Signed-off-by Protat, RemyX<remyx.protat@intel.com>
Reviewed-on: http://android.intel.com:8080/38372
Reviewed-by: Protat, RemyX <remyx.protat@intel.com>
Tested-by: Protat, RemyX <remyx.protat@intel.com>

diff --git a/drivers/staging/mrst/drv/mdfld_dsi_pkg_sender.c b/drivers/staging/mrst/drv/mdfld_dsi_pkg_sender.c
index 1be4586..e9f7df5 100644 (file)
--- a/drivers/staging/mrst/drv/mdfld_dsi_pkg_sender.c
+++ b/drivers/staging/mrst/drv/mdfld_dsi_pkg_sender.c
@@ -65,7 +65,7 @@ const char * dsi_errors[] = {
        "RX Prot Violation",
        "HS Generic Write FIFO Full",
        "LP Generic Write FIFO Full",
-       "Generic Read Data Avail",
+       "Generic Read Data Avail"
        "Special Packet Sent",
        "Tearing Effect",
 };

diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c
index 77bf6db..d8b2714 100644 (file)
--- a/drivers/staging/mrst/drv/psb_drv.c
+++ b/drivers/staging/mrst/drv/psb_drv.c
@@ -3924,7 +3924,7 @@ static __init int parse_hdmi_edid(char *arg)
        if ((!arg) || (strlen(arg) >= 20))
                return -EINVAL;
 
-       strncpy(HDMI_EDID, arg, strlen(arg));
+       strncpy(HDMI_EDID, arg, sizeof(HDMI_EDID));
 
        return 0;
 }

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
index ab88cf9..7ea05fb 100755 (executable)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c
@@ -2040,7 +2040,7 @@ PVRSRV_ERROR OSEventObjectCreateKM(const IMG_CHAR *pszName, PVRSRV_EVENTOBJECT *
        if (pszName && strlen(pszName) <= EVENTOBJNAME_MAXLENGTH)
         {
             
-            strncpy(psEventObject->szName, pszName, strlen(pszName));
+            strncpy(psEventObject->szName, pszName, EVENTOBJNAME_MAXLENGTH);
         }
         else
         {

diff --git a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
index c3d2b2d..ff27e71 100755 (executable)
--- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
+++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c
@@ -174,7 +174,6 @@ IMG_VOID PVRSRVReleasePrintf(const IMG_CHAR *pszFormat, ...)
        va_list vaArgs;
        unsigned long ulLockFlags = 0;
        IMG_CHAR *pszBuf;
-       const IMG_CHAR *pszName = "PVR_K: ";
        IMG_UINT32 ui32BufSiz;
 
        SelectBuffer(&pszBuf, &ui32BufSiz);
@@ -182,7 +181,7 @@ IMG_VOID PVRSRVReleasePrintf(const IMG_CHAR *pszFormat, ...)
        va_start(vaArgs, pszFormat);
 
        GetBufferLock(&ulLockFlags);
-       strncpy (pszBuf, pszName, strlen(pszName));
+       strncpy (pszBuf, "PVR_K: ", (ui32BufSiz -1));
 
        if (VBAppend(pszBuf, ui32BufSiz, pszFormat, vaArgs))
        {