[Midnightbsd-cvs] src [9391] trunk/sys/dev/bktr/msp34xx.c: Pass a format string to kproc_create() [1] and thus fix the build with
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 4 16:26:01 EST 2017
Revision: 9391
http://svnweb.midnightbsd.org/src/?rev=9391
Author: laffer1
Date: 2017-03-04 16:26:01 -0500 (Sat, 04 Mar 2017)
Log Message:
-----------
Pass a format string to kproc_create() [1] and thus fix the build with
-DBKTR_NEW_MSP34XX_DRIVER and -Wformat-security.
Modified Paths:
--------------
trunk/sys/dev/bktr/msp34xx.c
Modified: trunk/sys/dev/bktr/msp34xx.c
===================================================================
--- trunk/sys/dev/bktr/msp34xx.c 2017-03-04 21:25:35 UTC (rev 9390)
+++ trunk/sys/dev/bktr/msp34xx.c 2017-03-04 21:26:01 UTC (rev 9391)
@@ -134,7 +134,6 @@
/* thread */
struct proc *kthread;
- char *threaddesc;
int active,restart,rmmod;
@@ -1147,12 +1146,6 @@
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 @@
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 @@
/* 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;
More information about the Midnightbsd-cvs
mailing list