diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/tftp-proper-nul-termination | 81 |
3 files changed, 84 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d1e4c465..16791a50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ shim (0.4-0ubuntu4) UNRELEASED; urgency=low prototype mismatches. * debian/patches/fix-compiler-warnings: Fix remaining compiler warnings in netboot.c. + * debian/patches/tftp-proper-nul-termination: fix nul termination + errors in filenames passed to tftp. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 20 Sep 2013 14:43:23 +0000 diff --git a/debian/patches/series b/debian/patches/series index ced10f02..cd7c5012 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ no-print-on-unsigned fix-tftp-prototype build-with-Werror fix-compiler-warnings +tftp-proper-nul-termination diff --git a/debian/patches/tftp-proper-nul-termination b/debian/patches/tftp-proper-nul-termination new file mode 100644 index 00000000..7345cfc5 --- /dev/null +++ b/debian/patches/tftp-proper-nul-termination @@ -0,0 +1,81 @@ +Description: fix nul termination errors in filenames passed to tftp + Fix various errors in the tftp string handling, to ensure we always have + properly nul-terminated strings. +Author: Steve Langasek <steve.langasek@ubuntu.com> + +Index: shim/netboot.c +=================================================================== +--- shim.orig/netboot.c ++++ shim/netboot.c +@@ -227,15 +227,15 @@ + + static BOOLEAN extract_tftp_info(char *url) + { +- char *start, *end; ++ CHAR8 *start, *end; + char ip6str[128]; +- char *template = "/grubx64.efi"; ++ CHAR8 *template = (CHAR8 *)"/grubx64.efi"; + + if (strncmp((UINT8 *)url, (UINT8 *)"tftp://", 7)) { + Print(L"URLS MUST START WITH tftp://\n"); + return FALSE; + } +- start = url + 7; ++ start = (CHAR8 *)url + 7; + if (*start != '[') { + Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); + return FALSE; +@@ -250,21 +250,19 @@ + Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); + return FALSE; + } +- *end = '\0'; + memset(ip6str, 0, 128); +- memcpy(ip6str, start, strlen((UINT8 *)start)); +- *end = ']'; ++ memcpy(ip6str, start, end + 1 - start); + end++; + memcpy(&tftp_addr.v6, str2ip6(ip6str), 16); +- full_path = AllocatePool(strlen((UINT8 *)end)+strlen((UINT8 *)template)+1); ++ full_path = AllocateZeroPool(strlen(end)+strlen(template)+1); + if (!full_path) + return FALSE; +- memset(full_path, 0, strlen((UINT8 *)end)+strlen((UINT8 *)template)); +- memcpy(full_path, end, strlen((UINT8 *)end)); +- end = strrchr((char *)full_path, '/'); ++ memcpy(full_path, end, strlen(end)); ++ end = (CHAR8 *)strrchr((char *)full_path, '/'); + if (!end) +- end = (char *)full_path; +- memcpy(end, template, strlen((UINT8 *)template)); ++ end = (CHAR8 *)full_path; ++ memcpy(end, template, strlen(template)); ++ end[strlen(template)] = '\0'; + + return TRUE; + } +@@ -285,19 +283,15 @@ + + static EFI_STATUS parseDhcp4() + { +- char *template = "/grubx64.efi"; +- char *tmp = AllocatePool(16); ++ CHAR8 *template = (CHAR8 *)"/grubx64.efi"; ++ full_path = AllocateZeroPool(strlen(template)+1); + +- +- if (!tmp) ++ if (!full_path) + return EFI_OUT_OF_RESOURCES; + +- + memcpy(&tftp_addr.v4, pxe->Mode->DhcpAck.Dhcpv4.BootpSiAddr, 4); + +- memcpy(tmp, template, 12); +- tmp[13] = '\0'; +- full_path = (UINT8 *)tmp; ++ memcpy(full_path, template, strlen(template)); + + /* Note we don't capture the filename option here because we know its shim.efi + * We instead assume the filename at the end of the path is going to be grubx64.efi |