diff --git a/ChangeLog b/ChangeLog
index fc31a45396..066c213437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-17  Andreas Schwab  <schwab@suse.de>
+
+	* resolv/res_send.c (__res_context_send): Don't set errno when
+	returing error after malloc failure.
+
 2018-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* nptl/allocatestack.c (allocate_stack): Remove the
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 9e9541789b..947ebf5212 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -472,10 +472,7 @@ __res_context_send (struct resolv_context *ctx,
 					sizeof (struct sockaddr_in6)
 					- sizeof (struct sockaddr_in));
 			else
-			  {
-			    __set_errno (ENOMEM);
-			    return -1;
-			  }
+				return -1;
 		}
 		EXT(statp).nscount = statp->nscount;
 	}