d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass a format string to kproc_create() [1] and thus fix the build with

Browse Source 
-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
This commit is contained in:
Sergey Kandaurov 2013-04-30 05:08:17 +00:00
parent c9838c3ab8
commit f6fea6cebc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=250088
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/bktr/msp34xx.c
View File

@ -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;