diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-03-04 20:37:00 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 10:39:25 +0000 |
commit | b35846c104d15e29edace0e159cb6c105d13cd59 (patch) | |
tree | 5fdd3515d7e9b1cf480939275a6451242182adf4 /meta/recipes-core/musl | |
parent | 206ca252c64eb0048f05da6933b5923b2346ef09 (diff) | |
download | poky-b35846c104d15e29edace0e159cb6c105d13cd59.tar.gz |
musl: Update for few bugfixes
We have seen/reported few dlopen related fixes which has been fixed
upstream, therefore upgrade
all set of changes
https://git.musl-libc.org/cgit/musl/log/?qt=range&q=6516282d2adfad2c7e66d854cde3357120c75dbd..43e7efb46555f13a556d92944ac05c19b8929b60
(From OE-Core rev: 7930f114aff8e00e777a26656e465f1fe43780b5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/musl')
-rw-r--r-- | meta/recipes-core/musl/musl/out_of_bounds_read.patch | 20 | ||||
-rw-r--r-- | meta/recipes-core/musl/musl_git.bb | 3 |
2 files changed, 1 insertions, 22 deletions
diff --git a/meta/recipes-core/musl/musl/out_of_bounds_read.patch b/meta/recipes-core/musl/musl/out_of_bounds_read.patch deleted file mode 100644 index a681cc284e..0000000000 --- a/meta/recipes-core/musl/musl/out_of_bounds_read.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Fix out of bounds read | ||
2 | |||
3 | self->dtv hasn't been extended yet | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | diff --git a/ldso/dynlink.c b/ldso/dynlink.c | ||
9 | index e2c3259f..b23ea0df 100644 | ||
10 | --- a/ldso/dynlink.c | ||
11 | +++ b/ldso/dynlink.c | ||
12 | @@ -1374,7 +1376,7 @@ static void install_new_tls(void) | ||
13 | } | ||
14 | /* Install new dtls into the enlarged, uninstalled dtv copies. */ | ||
15 | for (p=head; ; p=p->next) { | ||
16 | - if (!p->tls_id || self->dtv[p->tls_id]) continue; | ||
17 | + if (p->tls_id <= old_cnt) continue; | ||
18 | unsigned char *mem = p->new_tls; | ||
19 | for (j=0; j<i; j++) { | ||
20 | unsigned char *new = mem; | ||
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb index 6a72b7d3bc..2d8dab90dd 100644 --- a/meta/recipes-core/musl/musl_git.bb +++ b/meta/recipes-core/musl/musl_git.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | require musl.inc | 4 | require musl.inc |
5 | inherit linuxloader | 5 | inherit linuxloader |
6 | 6 | ||
7 | SRCREV = "6516282d2adfad2c7e66d854cde3357120c75dbd" | 7 | SRCREV = "43e7efb46555f13a556d92944ac05c19b8929b60" |
8 | 8 | ||
9 | BASEVER = "1.1.21" | 9 | BASEVER = "1.1.21" |
10 | 10 | ||
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}" | |||
15 | SRC_URI = "git://git.musl-libc.org/musl \ | 15 | SRC_URI = "git://git.musl-libc.org/musl \ |
16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ | 16 | file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ |
17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ | 17 | file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ |
18 | file://out_of_bounds_read.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |