vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/getroot.c (ESCAPED_PATH_MAX): New define.

Browse source 
(mountinfo_entry): Increase the field size to take escaping into
	account.
	(find_root_device_from_libzfs): Add one byte to size of strings for
	security.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-23 11:36:31 +01:00
parent 66a2ecd123
commit b87f7ef26b
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2011-12-23 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (ESCAPED_PATH_MAX): New define.
(mountinfo_entry): Increase the field size to take escaping into
account.
(find_root_device_from_libzfs): Add one byte to size of strings for
security.
2011-12-23 Vladimir Serbinenko <phcoder@gmail.com> 2011-12-23 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/reed_solomon.c (grub_reed_solomon_add_redundancy): Add * grub-core/lib/reed_solomon.c (grub_reed_solomon_add_redundancy): Add

11
util/getroot.c
View file

@ -117,12 +117,13 @@ xgetcwd (void)
#ifdef __linux__ #ifdef __linux__
#define ESCAPED_PATH_MAX (4 * PATH_MAX)
struct mountinfo_entry struct mountinfo_entry
{ {
int id; int id;
int major, minor; int major, minor;
char enc_root[PATH_MAX], enc_path[PATH_MAX]; char enc_root[ESCAPED_PATH_MAX + 1], enc_path[ESCAPED_PATH_MAX + 1];
char fstype[PATH_MAX], device[PATH_MAX]; char fstype[ESCAPED_PATH_MAX + 1], device[ESCAPED_PATH_MAX + 1];
}; };
/* Statting something on a btrfs filesystem always returns a virtual device /* Statting something on a btrfs filesystem always returns a virtual device
@ -352,7 +353,8 @@ find_root_device_from_libzfs (const char *dir)
size_t len; size_t len;
int st; int st;
char name[PATH_MAX], state[256], readlen[256], writelen[256], cksum[256], notes[256]; char name[PATH_MAX + 1], state[257], readlen[257], writelen[257];
char cksum[257], notes[257];
unsigned int dummy; unsigned int dummy;
cmd = xasprintf ("zpool status %s", poolname); cmd = xasprintf ("zpool status %s", poolname);
@ -367,7 +369,8 @@ find_root_device_from_libzfs (const char *dir)
if (ret == -1) if (ret == -1)
goto fail; goto fail;
if (sscanf (line, " %s %256s %256s %256s %256s %256s", name, state, readlen, writelen, cksum, notes) >= 5) if (sscanf (line, " %s %256s %256s %256s %256s %256s",
name, state, readlen, writelen, cksum, notes) >= 5)
switch (st) switch (st)
{ {
case 0: case 0: