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

- Set proper max length when parsing xdr requests (#848748).

Browse Source
This commit is contained in:
Jeff Law 2012-10-01 15:36:29 -06:00
parent abd0f46444
commit 1117842dc4
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
glibc-rh848748.patch Normal file
View File

@ -0,0 +1,56 @@
2012-10-01 Patsy Franklin <pfrankli@redhat.com>
Honza Horak <hhorak@redhat.com>
* nis/yp_xdr.c (xdr_domainname): Use YPMAXDOMAIN as maxsize.
(xdr_mapname): Use YPMAXMAP as maxsize.
(xdr_peername): Use YPMAXPEER as maxsize.
(xdr_keydat): Use YPAXRECORD as maxsize.
(xdr_valdat): Use YPMAXRECORD as maxsize.
diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
index 76e0f2f..4188506 100644
--- a/nis/yp_xdr.c
+++ b/nis/yp_xdr.c
@@ -49,21 +49,21 @@ libnsl_hidden_def (xdr_ypxfrstat)
bool_t
xdr_domainname (XDR *xdrs, domainname *objp)
{
- return xdr_string (xdrs, objp, ~0);
+ return xdr_string (xdrs, objp, YPMAXDOMAIN);
}
libnsl_hidden_def (xdr_domainname)
bool_t
xdr_mapname (XDR *xdrs, mapname *objp)
{
- return xdr_string (xdrs, objp, ~0);
+ return xdr_string (xdrs, objp, YPMAXMAP);
}
libnsl_hidden_def (xdr_mapname)
bool_t
xdr_peername (XDR *xdrs, peername *objp)
{
- return xdr_string (xdrs, objp, ~0);
+ return xdr_string (xdrs, objp, YPMAXPEER);
}
libnsl_hidden_def (xdr_peername)
@@ -71,7 +71,7 @@ bool_t
xdr_keydat (XDR *xdrs, keydat *objp)
{
return xdr_bytes (xdrs, (char **) &objp->keydat_val,
- (u_int *) &objp->keydat_len, ~0);
+ (u_int *) &objp->keydat_len, YPMAXRECORD);
}
libnsl_hidden_def (xdr_keydat)
@@ -79,7 +79,7 @@ bool_t
xdr_valdat (XDR *xdrs, valdat *objp)
{
return xdr_bytes (xdrs, (char **) &objp->valdat_val,
- (u_int *) &objp->valdat_len, ~0);
+ (u_int *) &objp->valdat_len, YPMAXRECORD);
}
libnsl_hidden_def (xdr_valdat)

7
glibc.spec
View File

@ -28,7 +28,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 17%{?dist}
Release: 18%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -112,6 +112,7 @@ Patch0034: %{name}-rh841318.patch
Patch1035: %{name}-rh845960.patch
Patch1037: %{name}-rh849203.patch
Patch1038: %{name}-rh805093.patch
Patch1041: %{name}-rh848748.patch
#
# Patches submitted, but not yet approved upstream.
@ -442,6 +443,7 @@ rm -rf %{glibcportsdir}
%patch1038 -p1
%patch2039 -p1
%patch2040 -p1
%patch1041 -p1
# On powerpc32, hp timing is only available in power4/power6
# libs, not in base, so pre-power4 dynamic linker is incompatible
@ -1248,6 +1250,9 @@ rm -f *.filelist*
%endif
%changelog
* Mon Oct 1 2012 Jeff Law <law@redhat.com> - 2.16-18
- Set proper max length when parsing xdr requests (#848748).
* Fri Sep 21 2012 Jeff Law <law@redhat.com> - 2.16-17
- Remove broken patch for 816647.