Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Jan 2012 21:30:16 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-bugs@FreeBSD.org
Subject:   Re: bin/83359: commit references a PR
Message-ID:  <201201062130.q06LUGvF024236@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR bin/83359; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/83359: commit references a PR
Date: Fri,  6 Jan 2012 21:28:44 +0000 (UTC)

 Author: ghelmer
 Date: Fri Jan  6 21:28:29 2012
 New Revision: 229735
 URL: http://svn.freebsd.org/changeset/base/229735
 
 Log:
   Handle memory allocation failures in devstat_getdevs(), devstat_selectdevs(),
   and devstat_buildmatch().
   
   PR:		bin/83359
   Reviewed by:	ken
 
 Modified:
   head/lib/libdevstat/devstat.c
 
 Modified: head/lib/libdevstat/devstat.c
 ==============================================================================
 --- head/lib/libdevstat/devstat.c	Fri Jan  6 21:23:00 2012	(r229734)
 +++ head/lib/libdevstat/devstat.c	Fri Jan  6 21:28:29 2012	(r229735)
 @@ -365,6 +365,12 @@ devstat_getdevs(kvm_t *kd, struct statin
  			dssize = (dinfo->numdevs * sizeof(struct devstat)) +
  				 sizeof(long);
  			dinfo->mem_ptr = (u_int8_t *)malloc(dssize);
 +			if (dinfo->mem_ptr == NULL) {
 +				snprintf(devstat_errbuf, sizeof(devstat_errbuf),
 +					 "%s: Cannot allocate memory for mem_ptr element",
 +					 __func__);
 +				return(-1);
 +			}
  		} else
  			dssize = (dinfo->numdevs * sizeof(struct devstat)) +
  				 sizeof(long);
 @@ -567,7 +573,7 @@ devstat_selectdevs(struct device_selecti
  	 * either enlarge or reduce the size of the device selection list.
  	 */
  	} else if (*num_selections != numdevs) {
 -		*dev_select = (struct device_selection *)realloc(*dev_select,
 +		*dev_select = (struct device_selection *)reallocf(*dev_select,
  			numdevs * sizeof(struct device_selection));
  		*select_generation = current_generation;
  		init_selections = 1;
 @@ -581,6 +587,13 @@ devstat_selectdevs(struct device_selecti
  		init_selections = 1;
  	}
  
 +	if (*dev_select == NULL) {
 +		snprintf(devstat_errbuf, sizeof(devstat_errbuf),
 +			 "%s: Cannot (re)allocate memory for dev_select argument",
 +			 __func__);
 +		return(-1);
 +	}
 +
  	/*
  	 * If we're in "only" mode, we want to clear out the selected
  	 * variable since we're going to select exactly what the user wants
 @@ -608,6 +621,12 @@ devstat_selectdevs(struct device_selecti
  	 || (perf_select != 0)) && (changed == 0)){
  		old_dev_select = (struct device_selection *)malloc(
  		    *num_selections * sizeof(struct device_selection));
 +		if (old_dev_select == NULL) {
 +			snprintf(devstat_errbuf, sizeof(devstat_errbuf),
 +				 "%s: Cannot allocate memory for selection list backup",
 +				 __func__);
 +			return(-1);
 +		}
  		old_num_selections = *num_selections;
  		bcopy(*dev_select, old_dev_select, 
  		    sizeof(struct device_selection) * *num_selections);
 @@ -1028,16 +1047,17 @@ devstat_buildmatch(char *match_str, stru
  		return(-1);
  	}
  
 -	/*
 -	 * Since you can't realloc a pointer that hasn't been malloced
 -	 * first, we malloc first and then realloc.
 -	 */
  	if (*num_matches == 0)
 -		*matches = (struct devstat_match *)malloc(
 -			   sizeof(struct devstat_match));
 -	else
 -		*matches = (struct devstat_match *)realloc(*matches,
 -			  sizeof(struct devstat_match) * (*num_matches + 1));
 +		*matches = NULL;
 +
 +	*matches = (struct devstat_match *)reallocf(*matches,
 +		  sizeof(struct devstat_match) * (*num_matches + 1));
 +
 +	if (*matches == NULL) {
 +		snprintf(devstat_errbuf, sizeof(devstat_errbuf),
 +			 "%s: Cannot allocate memory for matches list", __func__);
 +		return(-1);
 +	}
  			  
  	/* Make sure the current entry is clear */
  	bzero(&matches[0][*num_matches], sizeof(struct devstat_match));
 _______________________________________________
 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"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201062130.q06LUGvF024236>