Add glibc patch for res_query assertion on bad dns

Change-Id: Ibccbaa7c0946bca1c58722cff65bd96b4685a676 Reviewed-on: http://photon-jenkins.eng.vmware.com/628 Tested-by: Divya Thaluru <[email protected]> Reviewed-by: Divya Thaluru <[email protected]>
qiyanqi · Mar 12, 2016 · 24fd7b7 · 24fd7b7
1 parent 9c9053a
commit 24fd7b7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/SPECS/glibc/glibc-2.22-upstream_fixes-1.patch b/SPECS/glibc/glibc-2.22-upstream_fixes-1.patch
@@ -1048,7 +1048,16 @@ Description:             Various fixes identified upstream
  	struct timespec now, timeout, finish;
  	struct pollfd pfd[1];
  	int ptimeout;
-@@ -1040,6 +1167,8 @@
+@@ -1030,6 +1157,8 @@
+
+ 	int retval;
+  retry_reopen:
++	if (resplen2 != NULL)
++	  *resplen2 = 0;
+ 	retval = reopen (statp, terrno, ns);
+ 	if (retval <= 0)
+ 		return retval;
+@@ -1040,11 +1169,11 @@
  	int need_recompute = 0;
  	int nwritten = 0;
  	int recvresp1 = 0;
@@ -1057,6 +1066,11 @@ Description:             Various fixes identified upstream
  	int recvresp2 = buf2 == NULL;
  	pfd[0].fd = EXT(statp).nssocks[ns];
  	pfd[0].events = POLLOUT;
+-	if (resplen2 != NULL)
+-	  *resplen2 = 0;
+  wait:
+ 	if (need_recompute) {
+ 	recompute_resend:
 @@ -1203,55 +1332,56 @@
  		int *thisresplenp;
 

diff --git a/SPECS/glibc/glibc.spec b/SPECS/glibc/glibc.spec
@@ -6,7 +6,7 @@
 Summary:	Main C library
 Name:		glibc
 Version:	2.22
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	LGPLv2+
 URL:		http://www.gnu.org/software/libc
 Group:		Applications/System
@@ -175,6 +175,9 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig
 
 
 %changelog
+* 	Fri Mar 11 2016 Priyesh Padmavilasom <[email protected]>  2.22-4
+- 	Added patch for res_qeury assertion with bad dns config
+-       Details: https://sourceware.org/bugzilla/show_bug.cgi?id=19791
 * 	Tue Feb 16 2016 Anish Swaminathan <[email protected]>  2.22-3
 - 	Added patch for CVE-2015-7547
 * 	Mon Feb 08 2016 Anish Swaminathan <[email protected]>  2.22-2