system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Fix logic error in swapoff case: follow same handling of p and

Browse source 
linelen in the swapon case.
 - Use strlcpy instead of strncpy.

MFC after:	1 week
This commit is contained in:
Xin LI 2020-05-04 05:49:11 +00:00
parent 4abfd5bd93
commit 883b75538f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=360619
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sbin/swapon/swapon.c
View file

@ -548,8 +548,7 @@ swap_on_off_md(const char *name, char *mntops, int doingall)
ret = NULL;
goto err;
}
strncpy(linebuf, p, linelen);
linebuf[linelen - 1] = '\0';
strlcpy(linebuf, p, linelen);
errno = 0;
ul = strtoul(linebuf, &p, 10);
if (errno == 0) {
@ -604,14 +603,13 @@ swap_on_off_md(const char *name, char *mntops, int doingall)
goto err;
}
p = fgetln(sfd, &linelen);
if (p == NULL &&
(linelen < 2 || linelen > sizeof(linebuf) - 1)) {
if (p == NULL ||
(linelen < 2 || linelen > sizeof(linebuf))) {
warn("mdconfig (list) unexpected output");
ret = NULL;
goto err;
}
strncpy(linebuf, p, linelen);
linebuf[linelen - 1] = '\0';
strlcpy(linebuf, p, linelen);
p = strchr(linebuf, ' ');
if (p != NULL)
*p = '\0';