Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 15 May 2013 21:37:08 +0000 (UTC)
From:      Sergey Kandaurov <pluknet@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r250684 - stable/8/sys/dev/bktr
Message-ID:  <201305152137.r4FLb8U8015137@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pluknet
Date: Wed May 15 21:37:08 2013
New Revision: 250684
URL: http://svnweb.freebsd.org/changeset/base/250684

Log:
  MFC r250088:
    Pass a format string to kproc_create() [1] and thus fix the build with
    -DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
  
  PR:		kern/175546

Modified:
  stable/8/sys/dev/bktr/msp34xx.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/bktr/   (props changed)

Modified: stable/8/sys/dev/bktr/msp34xx.c
==============================================================================
--- stable/8/sys/dev/bktr/msp34xx.c	Wed May 15 21:35:22 2013	(r250683)
+++ stable/8/sys/dev/bktr/msp34xx.c	Wed May 15 21:37:08 2013	(r250684)
@@ -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;

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