summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/musl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/musl')
-rw-r--r--meta/recipes-core/musl/musl/out_of_bounds_read.patch20
-rw-r--r--meta/recipes-core/musl/musl_git.bb3
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 @@
1Fix out of bounds read
2
3self->dtv hasn't been extended yet
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8diff --git a/ldso/dynlink.c b/ldso/dynlink.c
9index 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 @@
4require musl.inc 4require musl.inc
5inherit linuxloader 5inherit linuxloader
6 6
7SRCREV = "6516282d2adfad2c7e66d854cde3357120c75dbd" 7SRCREV = "43e7efb46555f13a556d92944ac05c19b8929b60"
8 8
9BASEVER = "1.1.21" 9BASEVER = "1.1.21"
10 10
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}"
15SRC_URI = "git://git.musl-libc.org/musl \ 15SRC_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
21S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"