1e8491e670
Signed-off-by: lvying6 <lvying6@huawei.com> (cherry picked from commit 9b2f121d729ab002d75baa22a57b031e1fd0fdbf)
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From 442387b8712c2b6ba92689d4702aa2c9899527d0 Mon Sep 17 00:00:00 2001
|
|
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
|
|
Date: Tue, 11 Oct 2022 14:22:35 +0100
|
|
Subject: [PATCH] elf: Fix alloca size in _dl_debug_vdprintf
|
|
|
|
Reference: https://sourceware.org/git/?p=glibc.git;a=commit;h=eef17d4d9fcd38c5cbb9bc9515ba72d1773b67a2
|
|
Conflict: _dl_debug_vdprintf is in elf/dl-misc.c, update here
|
|
|
|
The alloca size did not consider the optional width parameter for
|
|
padding which could cause buffer underflow. The width is currently used
|
|
e.g. by _dl_map_object_from_fd which passes 2 * sizeof(void *) which
|
|
can be larger than the alloca buffer size on targets where
|
|
sizeof(void *) >= 2 * sizeof(unsigned long).
|
|
|
|
Even if large width is not used on existing targets it is better to fix
|
|
the formatting code to avoid surprises.
|
|
|
|
Reviewed-by: Florian Weimer <fweimer@redhat.com>
|
|
---
|
|
elf/dl-misc.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
|
|
index b256d792..a11d11d5 100644
|
|
--- a/elf/dl-misc.c
|
|
+++ b/elf/dl-misc.c
|
|
@@ -206,8 +206,11 @@ _dl_debug_vdprintf (int fd, int tag_p, const char *fmt, va_list arg)
|
|
/* We use alloca() to allocate the buffer with the most
|
|
pessimistic guess for the size. Using alloca() allows
|
|
having more than one integer formatting in a call. */
|
|
- char *buf = (char *) alloca (1 + 3 * sizeof (unsigned long int));
|
|
- char *endp = &buf[1 + 3 * sizeof (unsigned long int)];
|
|
+ int size = 1 + 3 * sizeof (unsigned long int);
|
|
+ if (width + 1 > size)
|
|
+ size = width + 1;
|
|
+ char *buf = (char *) alloca (size);
|
|
+ char *endp = &buf[size];
|
|
char *cp = _itoa (num, endp, *fmt == 'x' ? 16 : 10, 0);
|
|
|
|
/* Pad to the width the user specified. */
|
|
--
|
|
2.38.1
|
|
|