From bd0cfe07f4d78e8254bdee4881d4b3c51ceeb073 Mon Sep 17 00:00:00 2001 From: luliuhui Date: Wed, 21 Mar 2012 14:29:56 +0800 Subject: [PATCH] Graphic: Critical Klocwork issues for GRAPHICS domain BZ: 23906 Revise kw issue in round 51 scan in kernel. Change-Id: I8094b0054d0a91ae37eef89d2c95561eac84c2c7 Signed-off-by: luliuhui Reviewed-on: http://android.intel.com:8080/39901 Reviewed-by: Tong, BoX Tested-by: Tong, BoX Reviewed-by: buildbot Tested-by: buildbot --- drivers/staging/mrst/drv/psb_drv.c | 4 ++-- drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c | 5 ++--- drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_drv.c b/drivers/staging/mrst/drv/psb_drv.c index de0a538..d73d9a2 100644 --- a/drivers/staging/mrst/drv/psb_drv.c +++ b/drivers/staging/mrst/drv/psb_drv.c @@ -3866,10 +3866,10 @@ static __init int parse_hdmi_edid(char *arg) { /* HDMI EDID info can be passed in as a cmdline parameter, * and need to remove it after we can get EDID info via MSIC.*/ - if ((!arg) || (strlen(arg) >= 20)) + if ((!arg) || (strlen(arg) >= HDMI_MONITOR_NAME_LENGTH)) return -EINVAL; - strncpy(HDMI_EDID, arg, strlen(arg)); + strncpy(HDMI_EDID, arg, strlen(arg) + 1); 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..5c4c74e 100755 --- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c +++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/osfunc.c @@ -2037,10 +2037,9 @@ PVRSRV_ERROR OSEventObjectCreateKM(const IMG_CHAR *pszName, PVRSRV_EVENTOBJECT * if(psEventObject) { - if (pszName && strlen(pszName) <= EVENTOBJNAME_MAXLENGTH) + if (pszName && strlen(pszName) < EVENTOBJNAME_MAXLENGTH) { - - strncpy(psEventObject->szName, pszName, strlen(pszName)); + strncpy(psEventObject->szName, pszName, strlen(pszName) + 1); } 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..3a280fc 100755 --- a/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c +++ b/drivers/staging/mrst/pvr/services4/srvkm/env/linux/pvr_debug.c @@ -182,7 +182,7 @@ IMG_VOID PVRSRVReleasePrintf(const IMG_CHAR *pszFormat, ...) va_start(vaArgs, pszFormat); GetBufferLock(&ulLockFlags); - strncpy (pszBuf, pszName, strlen(pszName)); + strncpy (pszBuf, pszName, strlen(pszName) + 1); if (VBAppend(pszBuf, ui32BufSiz, pszFormat, vaArgs)) { -- 2.7.4