blob: 62e12897f586bc2a1e181a6e26ebc7b81facffe5 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From 7806340c2accc2c51e7e861b618c29fb5609a007 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Mar 2015 01:50:00 +0000
4Subject: [PATCH] nativesdk-glibc: Fix buffer overrun with a relocated SDK
5
6When ld-linux-*.so.2 is relocated to a path that is longer than the
7original fixed location, the dynamic loader will crash in open_path
8because it implicitly assumes that max_dirnamelen is a fixed size that
9never changes.
10
11The allocated buffer will not be large enough to contain the directory
12path string which is larger than the fixed location provided at build
13time.
14
15Upstream-Status: Inappropriate [OE SDK specific]
16
17Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 elf/dl-load.c | 12 ++++++++++++
21 1 file changed, 12 insertions(+)
22
23diff --git a/elf/dl-load.c b/elf/dl-load.c
24index 3226f2e531..7cb8a86fab 100644
25--- a/elf/dl-load.c
26+++ b/elf/dl-load.c
27@@ -1773,7 +1773,19 @@ open_path (const char *name, size_t namelen, int mode,
28 given on the command line when rtld is run directly. */
29 return -1;
30
31+ do
32+ {
33+ struct r_search_path_elem *this_dir = *dirs;
34+ if (this_dir->dirnamelen > max_dirnamelen)
35+ {
36+ max_dirnamelen = this_dir->dirnamelen;
37+ }
38+ }
39+ while (*++dirs != NULL);
40+
41 buf = alloca (max_dirnamelen + max_capstrlen + namelen);
42+
43+ dirs = sps->dirs;
44 do
45 {
46 struct r_search_path_elem *this_dir = *dirs;