github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-02 23:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #402 from rneugeba/htools-tweak

Browse Source 
hvtools: remove broken size check for mount points
This commit is contained in:
Justin Cormack 2016-08-10 14:35:19 +01:00 committed by GitHub
commit 5ab0f81954
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
alpine/packages/hvtools/src/hv_kvp_daemon.c
View File

@ -397,9 +397,9 @@ static int kvp_cifs_mount(const char *value)
gw[strlen(gw) - 1] = '\0'; gw[strlen(gw) - 1] = '\0';
/* Parse the value */ /* Parse the value:
* Make sure we have the right number of '\n'. Makes the code
/* Make sure we have the right number of '\n' */ * below simpler: no check for strchr() return value required. */
for (i = 0, count = 0; value[i]; i++) for (i = 0, count = 0; value[i]; i++)
count += (value[i] == '\n'); count += (value[i] == '\n');
if (count != 4) { if (count != 4) {
@ -410,22 +410,12 @@ static int kvp_cifs_mount(const char *value)
(void)strncpy(val, value, sizeof(val)); (void)strncpy(val, value, sizeof(val));
mntpoint = val; mntpoint = val;
t = strchr(mntpoint, '\n'); t = strchr(mntpoint, '\n');
if ((unsigned int)(t - mntpoint) >= sizeof(mntpoint) - 1) {
syslog(LOG_ERR, "mount: Mount point too long");
return -1;
}
*t = '\0'; *t = '\0';
bindpoint = t + 1; bindpoint = t + 1;
t = strchr(bindpoint, '\n'); t = strchr(bindpoint, '\n');
if ((unsigned int)(t - bindpoint) >= sizeof(bindpoint) - 1) {
syslog(LOG_ERR, "mount: Bind mount point too long");
return -1;
}
*t = '\0'; *t = '\0';
/* No need to check for length here as we check above for the
* right number of new-lines */
username = t + 1; username = t + 1;
t = strchr(username, '\n'); t = strchr(username, '\n');
*t = '\0'; *t = '\0';