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

Add additional sanity checks.

Browse Source
This commit is contained in:
Warner Losh 2019-12-09 01:32:18 +00:00
parent 1398c4c58a
commit f17a98a602
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libefivar/efivar-dp-xlate.c
View File

@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
#define MAX_DP_SANITY 4096 /* Biggest device path in bytes */ #define MAX_DP_SANITY 4096 /* Biggest device path in bytes */
#define MAX_DP_TEXT_LEN 4096 /* Longest string rep of dp */ #define MAX_DP_TEXT_LEN 4096 /* Longest string rep of dp */
#define ValidLen(dp) (DevicePathNodeLength(dp) >= sizeof(EFI_DEVICE_PATH_PROTOCOL) && \
DevicePathNodeLength(dp) < MAX_DP_SANITY)
#define G_PART "PART" #define G_PART "PART"
#define G_LABEL "LABEL" #define G_LABEL "LABEL"
#define G_DISK "DISK" #define G_DISK "DISK"
@ -142,6 +145,8 @@ efi_hd_to_unix(struct gmesh *mesh, const_efidp dp, char **dev, char **relpath, c
* Now, we can either have a filepath node next, or the end. * Now, we can either have a filepath node next, or the end.
* Otherwise, it's an error. * Otherwise, it's an error.
*/ */
if (!ValidLen(walker))
return (EINVAL);
walker = (const_efidp)NextDevicePathNode(walker); walker = (const_efidp)NextDevicePathNode(walker);
if ((uintptr_t)walker - (uintptr_t)dp > MAX_DP_SANITY) if ((uintptr_t)walker - (uintptr_t)dp > MAX_DP_SANITY)
return (EINVAL); return (EINVAL);
@ -333,11 +338,15 @@ efivar_device_path_to_unix_path(const_efidp dp, char **dev, char **relpath, char
* then we didn't find a media device path, so signal that error. * then we didn't find a media device path, so signal that error.
*/ */
walker = dp; walker = dp;
if (!ValidLen(walker))
return (EINVAL);
while (DevicePathType(walker) != MEDIA_DEVICE_PATH && while (DevicePathType(walker) != MEDIA_DEVICE_PATH &&
DevicePathType(walker) != END_DEVICE_PATH_TYPE) { DevicePathType(walker) != END_DEVICE_PATH_TYPE) {
walker = (const_efidp)NextDevicePathNode(walker); walker = (const_efidp)NextDevicePathNode(walker);
if ((uintptr_t)walker - (uintptr_t)dp > MAX_DP_SANITY) if ((uintptr_t)walker - (uintptr_t)dp > MAX_DP_SANITY)
return (EINVAL); return (EINVAL);
if (!ValidLen(walker))
return (EINVAL);
} }
if (DevicePathType(walker) != MEDIA_DEVICE_PATH) if (DevicePathType(walker) != MEDIA_DEVICE_PATH)
return (EINVAL); return (EINVAL);