From dan@kulesh.obluda.cz  Tue Jul 12 19:44:10 2005
Return-Path: <dan@kulesh.obluda.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9201316A41C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jul 2005 19:44:10 +0000 (GMT)
	(envelope-from dan@kulesh.obluda.cz)
Received: from kulesh.obluda.cz (kulesh.obluda.cz [193.179.22.243])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0DF4C43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jul 2005 19:44:07 +0000 (GMT)
	(envelope-from dan@kulesh.obluda.cz)
Received: from kulesh.obluda.cz (localhost.eunet.cz [127.0.0.1])
	by kulesh.obluda.cz (8.13.3/8.13.3) with ESMTP id j6CJi6vt016905
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Jul 2005 21:44:06 +0200 (CEST)
	(envelope-from dan@kulesh.obluda.cz)
Received: (from root@localhost)
	by kulesh.obluda.cz (8.13.3/8.13.1/Submit) id j6CJi5m9016904;
	Tue, 12 Jul 2005 21:44:05 +0200 (CEST)
	(envelope-from dan)
Message-Id: <200507121944.j6CJi5m9016904@kulesh.obluda.cz>
Date: Tue, 12 Jul 2005 21:44:05 +0200 (CEST)
From: Dan Lukes <dan@obluda.cz>
Reply-To: Dan Lukes <dan@obluda.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ PATCH ] Improper handling of malloc failures within libc's yp/xdryp.c
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         83348
>Category:       bin
>Synopsis:       [patch] Improper handling of malloc failures within libc's yp/xdryp.c
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 12 19:50:19 GMT 2005
>Closed-Date:    Thu Dec 22 19:57:46 CST 2011
>Last-Modified:  Fri Dec 23 02:00:25 UTC 2011
>Originator:     Dan Lukes
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Obludarium
>Environment:
System: FreeBSD 5.4-STABLE #8: Sat Jul 9 16:31:08 CEST 2005 i386
lib/libc/yp/xdryp.c,v 1.14 2002/04/28 15:18:47 des

	
>Description:
	Improper handling of malloc failures
>How-To-Repeat:
>Fix:

--- patch begins here ---
--- lib/libc/yp/xdryp.c.ORIG	Sun Apr 28 17:18:47 2002
+++ lib/libc/yp/xdryp.c	Tue Jul 12 21:37:07 2005
@@ -82,10 +82,21 @@
 		switch (status) {
 		case YP_TRUE:
 			key = (char *)malloc(out.ypresp_all_u.val.key.keydat_len + 1);
+			if (key == NULL) {
+				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
+				*objp = YP_YPERR;
+				return (FALSE);
+			}
 			bcopy(out.ypresp_all_u.val.key.keydat_val, key,
 				out.ypresp_all_u.val.key.keydat_len);
 			key[out.ypresp_all_u.val.key.keydat_len] = '\0';
 			val = (char *)malloc(out.ypresp_all_u.val.val.valdat_len + 1);
+			if (val == NULL) {
+				free(key);
+				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
+				*objp = YP_YPERR;
+				return (FALSE);
+			}
 			bcopy(out.ypresp_all_u.val.val.valdat_val, val,
 				out.ypresp_all_u.val.val.valdat_len);
 			val[out.ypresp_all_u.val.val.valdat_len] = '\0';
--- patch ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ghelmer 
State-Changed-When: Thu Dec 22 19:57:03 CST 2011 
State-Changed-Why:  
Applied, thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=83348 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/83348: commit references a PR
Date: Fri, 23 Dec 2011 01:56:39 +0000 (UTC)

 Author: ghelmer
 Date: Fri Dec 23 01:56:25 2011
 New Revision: 228826
 URL: http://svn.freebsd.org/changeset/base/228826
 
 Log:
   Handle failures to malloc memory to hold key or val copies.
   
   PR:		bin/83348
 
 Modified:
   head/lib/libc/yp/xdryp.c
 
 Modified: head/lib/libc/yp/xdryp.c
 ==============================================================================
 --- head/lib/libc/yp/xdryp.c	Fri Dec 23 01:39:10 2011	(r228825)
 +++ head/lib/libc/yp/xdryp.c	Fri Dec 23 01:56:25 2011	(r228826)
 @@ -82,10 +82,21 @@ xdr_ypresp_all_seq(XDR *xdrs, u_long *ob
  		switch (status) {
  		case YP_TRUE:
  			key = (char *)malloc(out.ypresp_all_u.val.key.keydat_len + 1);
 +			if (key == NULL) {
 +				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 +				*objp = YP_YPERR;
 +				return (FALSE);
 +			}
  			bcopy(out.ypresp_all_u.val.key.keydat_val, key,
  				out.ypresp_all_u.val.key.keydat_len);
  			key[out.ypresp_all_u.val.key.keydat_len] = '\0';
  			val = (char *)malloc(out.ypresp_all_u.val.val.valdat_len + 1);
 +			if (val == NULL) {
 +				free(key);
 +				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 +				*objp = YP_YPERR;
 +				return (FALSE);
 +			}
  			bcopy(out.ypresp_all_u.val.val.valdat_val, val,
  				out.ypresp_all_u.val.val.valdat_len);
  			val[out.ypresp_all_u.val.val.valdat_len] = '\0';
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
