Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
---
drivers/staging/ced1401/userspace/use1401.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/ced1401/userspace/use1401.c b/drivers/staging/ced1401/userspace/use1401.c
index 7b8a222..98d0301 100644
--- a/drivers/staging/ced1401/userspace/use1401.c
+++ b/drivers/staging/ced1401/userspace/use1401.c
@@ -693,7 +693,7 @@ U14API(short) U14DriverName(short hand, char* pBuf, unsigned short wMax)
case 3: pName = "HSS"; break;
default: pName = "???"; break;
}
- strncpy(pBuf, pName, wMax); // Copy the correct name to return
+ strlcpy(pBuf, pName, wMax); /* Copy the correct name to return */
return U14ERR_NOERROR;
}
@@ -1079,7 +1079,7 @@ U14API(short) U14NameOf1401(short hand, char* pBuf, unsigned short wMax)
case U14TYPEPOWER3:pName = "Power1401-3"; break;
default: pName = "Unknown";
}
- strncpy(pBuf, pName, wMax);
+ strlcpy(pBuf, pName, wMax);
}
return sErr;
}
@@ -2891,10 +2891,8 @@ U14API(unsigned int) U14Ld(short hand, const char* vl, const char* str)
++dwIndex; // Keep count of command number, first is 1
szFName[iLoop2]=(char)0; // null terminate name of command
- strncpy(szLastName, szFName, sizeof(szLastName)); // Save for error info
- szLastName[sizeof(szLastName)-1] = 0;
- strncat(szLastName, szFExt, sizeof(szLastName)); // with extension included
- szLastName[sizeof(szLastName)-1] = 0;
+ strlcpy(szLastName, szFName, sizeof(szLastName)); /* Save for error info */
+ strlcat(szLastName, szFExt, sizeof(szLastName)); /* with extension included */
U14SendString(hand, szFName); // ask if loaded
U14SendString(hand, ";ERR;"); // add err return
--
1.7.10.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
