diff options
| author | Steve McIntyre <93sam@debian.org> | 2021-02-21 14:27:01 +0000 |
|---|---|---|
| committer | Steve McIntyre <93sam@debian.org> | 2021-02-21 16:33:31 +0000 |
| commit | e105392d54d0a369a7a6e5f636b62181d9a14d35 (patch) | |
| tree | d5d509c3465097427f00b0f168cfc336a18a0712 /debian/patches/avoid_null_vsprint.patch | |
| parent | 334e9afa91427a6ac9a465ce0fc6c5c8643defb9 (diff) | |
| download | efi-boot-shim-e105392d54d0a369a7a6e5f636b62181d9a14d35.tar.gz efi-boot-shim-e105392d54d0a369a7a6e5f636b62181d9a14d35.zip | |
Remove all our old patches, no longer needed:
- avoid_null_vsprint.patch
- check_null_sn_ln.patch
- fixup_git.patch
- uname.patch
- use_compare_mem_gcc9.patch
Diffstat (limited to 'debian/patches/avoid_null_vsprint.patch')
| -rw-r--r-- | debian/patches/avoid_null_vsprint.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/debian/patches/avoid_null_vsprint.patch b/debian/patches/avoid_null_vsprint.patch deleted file mode 100644 index cb056d6a..00000000 --- a/debian/patches/avoid_null_vsprint.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 20e731f423a438f53738de73af9ef3d67c4cba2f -Author: Peter Jones <pjones@redhat.com> -Date: Tue Feb 12 18:04:49 2019 -0500 - - VLogError(): Avoid NULL pointer dereferences in (V)Sprint calls - - VLogError() calculates the size of format strings by using calls to - SPrint and VSPrint with a StrSize of 0 and NULL for an output buffer. - Unfortunately, this is an incorrect usage of (V)Sprint. A StrSize - of "0" is special-cased to mean "there is no limit". So, we end up - writing our string to address 0x0. This was discovered because it - causes a crash on ARM where, unlike x86, it does not necessarily - have memory mapped at 0x0. - - Avoid the (V)Sprint calls altogether by using (V)PoolPrint, which - handles the size calculation and allocation for us. - - Signed-off-by: Peter Jones <pjones@redhat.com> - Fixes: 25f6fd08cd26 ("try to show errors more usefully.") - [dannf: commit message ] - Signed-off-by: dann frazier <dann.frazier@canonical.com> - -diff --git a/errlog.c b/errlog.c -index 18be482..eebb266 100644 ---- a/errlog.c -+++ b/errlog.c -@@ -14,29 +14,20 @@ EFI_STATUS - VLogError(const char *file, int line, const char *func, CHAR16 *fmt, va_list args) - { - va_list args2; -- UINTN size = 0, size2; - CHAR16 **newerrs; - -- size = SPrint(NULL, 0, L"%a:%d %a() ", file, line, func); -- va_copy(args2, args); -- size2 = VSPrint(NULL, 0, fmt, args2); -- va_end(args2); -- - newerrs = ReallocatePool(errs, (nerrs + 1) * sizeof(*errs), - (nerrs + 3) * sizeof(*errs)); - if (!newerrs) - return EFI_OUT_OF_RESOURCES; - -- newerrs[nerrs] = AllocatePool(size*2+2); -+ newerrs[nerrs] = PoolPrint(L"%a:%d %a() ", file, line, func); - if (!newerrs[nerrs]) - return EFI_OUT_OF_RESOURCES; -- newerrs[nerrs+1] = AllocatePool(size2*2+2); -+ va_copy(args2, args); -+ newerrs[nerrs+1] = VPoolPrint(fmt, args2); - if (!newerrs[nerrs+1]) - return EFI_OUT_OF_RESOURCES; -- -- SPrint(newerrs[nerrs], size*2+2, L"%a:%d %a() ", file, line, func); -- va_copy(args2, args); -- VSPrint(newerrs[nerrs+1], size2*2+2, fmt, args2); - va_end(args2); - - nerrs += 2; |
