Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Apr 2013 05:10:01 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-bugs@FreeBSD.org
Subject:   Re: kern/175546: commit references a PR
Message-ID:  <201304300510.r3U5A1i3046816@freefall.freebsd.org>

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/175546: commit references a PR
Date: Tue, 30 Apr 2013 05:08:30 +0000 (UTC)

 Author: pluknet
 Date: Tue Apr 30 05:08:17 2013
 New Revision: 250088
 URL: http://svnweb.freebsd.org/changeset/base/250088
 
 Log:
   Pass a format string to kproc_create() [1] and thus fix the build with
   -DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
   This also allows to eliminates a superfluous malloc/snprintf/free on
   intermediate buffer.
   
   PR:		kern/175546
   MFC after:	1 week
 
 Modified:
   head/sys/dev/bktr/msp34xx.c
 
 Modified: head/sys/dev/bktr/msp34xx.c
 ==============================================================================
 --- head/sys/dev/bktr/msp34xx.c	Tue Apr 30 01:15:10 2013	(r250087)
 +++ head/sys/dev/bktr/msp34xx.c	Tue Apr 30 05:08:17 2013	(r250088)
 @@ -134,7 +134,6 @@ struct msp3400c {
  
  	/* thread */
  	struct proc	    *kthread;
 -	char                *threaddesc;
  
  	int                  active,restart,rmmod;
  
 @@ -1147,12 +1146,6 @@ int msp_attach(bktr_ptr_t bktr)
  	msp->bass   = 32768;
  	msp->treble = 32768;
  	msp->input  = -1;
 -	msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT);
 -	if (msp->threaddesc == NULL) {
 -		free(msp, M_DEVBUF);
 -                return ENOMEM;
 -	}
 -	snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname);
  
  	for (i = 0; i < DFP_COUNT; i++)
  		msp->dfp_regs[i] = -1;
 @@ -1163,7 +1156,6 @@ int msp_attach(bktr_ptr_t bktr)
  	if (-1 != rev1)
  		rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f);
  	if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) {
 -		free(msp->threaddesc, M_DEVBUF);
  		free(msp, M_DEVBUF);
  		bktr->msp3400c_info = NULL;
  		printf("%s: msp3400: error while reading chip version\n", bktr_name(bktr));
 @@ -1199,10 +1191,9 @@ int msp_attach(bktr_ptr_t bktr)
  	/* startup control thread */
  	err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread,
  			     bktr, &msp->kthread, (RFFDG | RFPROC), 0,
 -			     msp->threaddesc);
 +			     "%s_msp34xx_thread", bktr->bktr_xname);
  	if (err) {
  		printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err);
 -		free(msp->threaddesc, M_DEVBUF);
  		free(msp, M_DEVBUF);
  		bktr->msp3400c_info = NULL;
  		return ENXIO;
 _______________________________________________
 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?201304300510.r3U5A1i3046816>