d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When we have a command returned by zfs_nextboot() that is longer

Browse Source 
than command in the loader.conf, the latter needs to be nul terminated,
otherwise garbage trailer left from zfs_nextboot() will be passed to
parse_cmd() together with loader.conf command.

While here, reset cmd to empty string if read() returns error.

Reviewed by:	tsoome
This commit is contained in:
Gleb Smirnoff 2020-08-20 20:31:47 +00:00
parent e627909d04
commit c7dd069c70
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=364441
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
stand/i386/zfsboot/zfsboot.c
View File

@ -248,7 +248,12 @@ main(void)
fd = open(PATH_DOTCONFIG, O_RDONLY);
if (fd != -1) {
read(fd, cmd, sizeof (cmd));
ssize_t cmdlen;
if ((cmdlen = read(fd, cmd, sizeof(cmd))) > 0)
cmd[cmdlen] = '\0';
else
*cmd = '\0';
close(fd);
}