rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolves: #1332912

Browse Source 
Fix heap-based buffer overflow in get_txt_records
This commit is contained in:
Florian Weimer 2016-05-06 14:22:22 +02:00
parent dd028df7c1
commit 62f2d369c8
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glibc-rh1332912.patch Normal file
View File

@ -0,0 +1,19 @@
commit 8a03ccbb77f52ec4b55062eeedddb8daec1a33e4
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon May 2 16:04:32 2016 +0200
hesiod: Avoid heap overflow in get_txt_records [BZ #20031]
Index: b/hesiod/hesiod.c
===================================================================
--- a/hesiod/hesiod.c
+++ b/hesiod/hesiod.c
@@ -421,7 +421,7 @@ get_txt_records(struct hesiod_p *ctx, in
cp += INT16SZ + INT32SZ; /* skip the ttl, too */
rr.dlen = ns_get16(cp);
cp += INT16SZ;
- if (cp + rr.dlen > eom) {
+ if (rr.dlen == 0 || cp + rr.dlen > eom) {
__set_errno(EMSGSIZE);
goto cleanup;
}

7
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.22 %define glibcsrcdir glibc-2.22
%define glibcversion 2.22 %define glibcversion 2.22
%define glibcrelease 11%{?dist} %define glibcrelease 12%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -224,6 +224,7 @@ Patch1001: glibc-rh1288662.patch
Patch1002: glibc-rh1276761-1.patch Patch1002: glibc-rh1276761-1.patch
Patch1003: glibc-rh1276761-2.patch Patch1003: glibc-rh1276761-2.patch
Patch1004: glibc-rh1276761-3.patch Patch1004: glibc-rh1276761-3.patch
Patch1005: glibc-rh1332912.patch
############################################################################## ##############################################################################
# #
@ -647,6 +648,7 @@ microbenchmark tests on the system.
%patch1002 -p1 %patch1002 -p1
%patch1003 -p1 %patch1003 -p1
%patch1004 -p1 %patch1004 -p1
%patch1005 -p1
%patch0059 -p1 %patch0059 -p1
############################################################################## ##############################################################################
@ -1867,6 +1869,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Fri May 6 2016 Florian Weimer <fweimer@redhat.com> - 2.22-12
- Fix heap-based buffer overflow in get_txt_records (#1332912)
* Wed Mar 02 2016 Mike FABIAN <mfabian@redhat.com> - 2.22-11 * Wed Mar 02 2016 Mike FABIAN <mfabian@redhat.com> - 2.22-11
- Add the C.UTF-8 locale - Add the C.UTF-8 locale