github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-24 18:27:18 +00:00
Code Issues Projects Releases Wiki Activity

dm: use strnlen to replace strlen

Browse Source 
Tracked-On: #2133
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Shuo A Liu
2018-12-25 10:33:36 +08:00
committed by wenlingz
parent 3e0b06cfd6
commit b3ad44d4c1
14 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devicemodel/hw/platform/rpmb/rpmb_backend.c
View File

@@ -205,7 +205,7 @@ static int rpmb_check_frame(const char *cmd_str, int *err,
return -1;
}
len = strlen(cmd_str) + 1;
len = strnlen(cmd_str, sizeof(WRITE_DATA_STR)) + 1;
if (len > sizeof(WRITE_DATA_STR))
len = sizeof(WRITE_DATA_STR);

4
devicemodel/hw/platform/tpm/tpm.c
View File

@@ -37,9 +37,9 @@ char *const token[] = {
int acrn_parse_vtpm2(char *arg)
{
char *value;
size_t len = strlen(arg);
size_t len = strnlen(arg, STR_MAX_LEN);
if (len > STR_MAX_LEN)
if (len == STR_MAX_LEN)
return -1;
if (SOCK_PATH_OPT == getsubopt(&arg, token, &value)) {

2
devicemodel/hw/platform/tpm/tpm_emulator.c
View File

@@ -217,7 +217,7 @@ static int ctrl_chan_conn(const char *servername)
return -1;
}
if (strlen(servername) > (sizeof(servaddr.sun_path) -1)) {
if (strnlen(servername, sizeof(servaddr.sun_path)) == (sizeof(servaddr.sun_path))) {
printf("%s error, length of servername is too long\n", __func__);
return -1;
}

3
devicemodel/hw/platform/usb_mouse.c
View File

@@ -59,6 +59,7 @@ enum {
UMSTR_MAX
};
#define UMOUSE_DESC_MAX_LEN 32
static const char *const umouse_desc_strings[] = {
"\x04\x09",
"ACRN-DM",
@@ -437,7 +438,7 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer)
goto done;
}
slen = 2 + strlen(str) * 2;
slen = 2 + strnlen(str, UMOUSE_DESC_MAX_LEN) * 2;
udata[0] = slen;
udata[1] = UDESC_STRING;