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

stand: fix buffer overflow in getrootmount()

Browse Source 
Reviewed by:	imp, allanjude
Sponsored By:   Beckhoff Automation GmbH & Co. KG
Sponsored By:   Klara, Inc.
Differential Revision:	https://reviews.freebsd.org/D38734
This commit is contained in:
Robert Wing 2023-02-25 09:37:32 +00:00
parent 773c13c686
commit c5f0198070
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stand/common/boot.c
View File

@ -32,8 +32,9 @@ __FBSDID("$FreeBSD$");
*/
#include <stand.h>
#include <sys/reboot.h>
#include <sys/boot.h>
#include <sys/kenv.h>
#include <sys/reboot.h>
#include <string.h>
#include "bootstrap.h"
@ -321,14 +322,14 @@ getbootfile(int try)
int
getrootmount(char *rootdev)
{
char lbuf[128], *cp, *ep, *dev, *fstyp, *options;
char lbuf[KENV_MVALLEN], *cp, *ep, *dev, *fstyp, *options;
int fd, error;
if (getenv("vfs.root.mountfrom") != NULL)
return(0);
error = 1;
sprintf(lbuf, "%s/etc/fstab", rootdev);
snprintf(lbuf, sizeof(lbuf), "%s/etc/fstab", rootdev);
if ((fd = open(lbuf, O_RDONLY)) < 0)
goto notfound;
@ -382,7 +383,7 @@ getrootmount(char *rootdev)
*cp = 0;
options = strdup(ep);
/* Build the <fstype>:<device> and save it in vfs.root.mountfrom */
sprintf(lbuf, "%s:%s", fstyp, dev);
snprintf(lbuf, sizeof(lbuf), "%s:%s", fstyp, dev);
setenv("vfs.root.mountfrom", lbuf, 0);
/* Don't override vfs.root.mountfrom.options if it is already set */