uclibc: Security fix CVE-2016-2225

CVE-2016-2225 Make sure to always terminate decoded string

This change is being provide to comply to Yocto compatiblility.

(From OE-Core rev: 093d76f3f4a385aae46304bd572ce1545c6bcf33)

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster 2016-02-10 15:46:01 -08:00 committed by Richard Purdie
parent ef135112fd
commit dc5f155e15
2 changed files with 33 additions and 0 deletions

View File

@ -20,5 +20,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
file://0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch \
file://0001-wire-in-syncfs.patch \
file://CVE-2016-2224.patch \
file://CVE-2016-2225.patch \
"
S = "${WORKDIR}/git"

View File

@ -0,0 +1,32 @@
From bb01edff0377f2585ce304ecbadcb7b6cde372ac Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 25 Jan 2016 21:11:34 +0100
Subject: [PATCH] Make sure to always terminate decoded string
Write a terminating '\0' to dest when the first byte of the encoded data
is 0. This corner case was previously missed.
Signed-off-by: Daniel Fahlgren <daniel@fahlgren.se>
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
Upstream-Status: Backport
http://repo.or.cz/uclibc-ng.git/commit/bb01edff0377f2585ce304ecbadcb7b6cde372ac
CVE: CVE-2016-2225
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
libc/inet/resolv.c | 1 +
1 file changed, 1 insertion(+)
Index: git/libc/inet/resolv.c
===================================================================
--- git.orig/libc/inet/resolv.c
+++ git/libc/inet/resolv.c
@@ -671,6 +671,7 @@ int __decode_dotted(const unsigned char
if (!packet)
return -1;
+ dest[0] = '\0';
while (--maxiter) {
if (offset >= packet_len)
return -1;