diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index c264ba282c..36b18a7569 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -39,7 +39,7 @@ config BR2_UCLIBC_VERSION_STRING string default 0.9.29 if BR2_UCLIBC_VERSION_0_9_29 default 0.9.30.3 if BR2_UCLIBC_VERSION_0_9_30 - default 0.9.31 if BR2_UCLIBC_VERSION_0_9_31 + default 0.9.31.1 if BR2_UCLIBC_VERSION_0_9_31 default 0.9.32-rc3 if BR2_UCLIBC_VERSION_0_9_32 default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT diff --git a/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch b/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch deleted file mode 100644 index 9956d591a0..0000000000 --- a/toolchain/uClibc/uClibc-0.9.31-dnslookup-use-after-free.patch +++ /dev/null @@ -1,36 +0,0 @@ -From eb1d8c8289f466ba3ad10b9a88ab2e426b8a9dc7 Mon Sep 17 00:00:00 2001 -From: Gabor Juhos -Date: Tue, 6 Apr 2010 09:55:19 +0200 -Subject: [PATCH] Fix use-after-free bug in __dns_lookup - -If the type of the first answer does not match with the requested type, -then the dotted name was freed. If there are no further answers in -the DNS reply, this pointer was used later on in the same function. -Additionally it is passed to the caller, and caused strange -behaviour. - -Signed-off-by: Gabor Juhos -Signed-off-by: Bernhard Reutner-Fischer ---- - libc/inet/resolv.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c -index 056539f..9459199 100644 ---- a/libc/inet/resolv.c -+++ b/libc/inet/resolv.c -@@ -1517,10 +1517,8 @@ int attribute_hidden __dns_lookup(const char *name, - memcpy(a, &ma, sizeof(ma)); - if (a->atype != T_SIG && (NULL == a->buf || (type != T_A && type != T_AAAA))) - break; -- if (a->atype != type) { -- free(a->dotted); -+ if (a->atype != type) - continue; -- } - a->add_count = h.ancount - j - 1; - if ((a->rdlength + sizeof(struct in_addr*)) * a->add_count > a->buflen) - break; --- -1.7.0 - diff --git a/toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-add-bsd-endian-conversions.patch rename to toolchain/uClibc/uClibc-0.9.31.1-add-bsd-endian-conversions.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-add-inotify-init1.patch rename to toolchain/uClibc/uClibc-0.9.31.1-add-inotify-init1.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch b/toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-add-sock-cloexec.patch rename to toolchain/uClibc/uClibc-0.9.31.1-add-sock-cloexec.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-fix-error-locale-utf-8.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-fix-error-locale-utf-8.patch rename to toolchain/uClibc/uClibc-0.9.31.1-fix-error-locale-utf-8.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-fix-fcntl64-for-64-bit-targets.patch b/toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-fix-fcntl64-for-64-bit-targets.patch rename to toolchain/uClibc/uClibc-0.9.31.1-fix-fcntl64-for-64-bit-targets.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-linuxthreads-errno-fix.patch rename to toolchain/uClibc/uClibc-0.9.31.1-linuxthreads-errno-fix.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-more-workarounds-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-more-workarounds-GCC-PR32219.patch rename to toolchain/uClibc/uClibc-0.9.31.1-more-workarounds-GCC-PR32219.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-powerpc-ptrace-fix.patch b/toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-powerpc-ptrace-fix.patch rename to toolchain/uClibc/uClibc-0.9.31.1-powerpc-ptrace-fix.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-quad-routines.patch b/toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-quad-routines.patch rename to toolchain/uClibc/uClibc-0.9.31.1-quad-routines.patch diff --git a/toolchain/uClibc/uClibc-0.9.31-workaround-GCC-PR32219.patch b/toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch similarity index 100% rename from toolchain/uClibc/uClibc-0.9.31-workaround-GCC-PR32219.patch rename to toolchain/uClibc/uClibc-0.9.31.1-workaround-GCC-PR32219.patch