2014-06-30 20:39:16

by Kees Cook

[permalink] [raw]
Subject: [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk

Since CL_PRINTF only ever takes a single argument, make sure a format
string cannot leak into printk.

Signed-off-by: Kees Cook <[email protected]>
---
.../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
index 871fc3c6d559..049f4c8d98a8 100644
--- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -114,7 +114,7 @@ extern u32 btc_dbg_type[];


#define CL_SPRINTF snprintf
-#define CL_PRINTF printk
+#define CL_PRINTF(buf) printk("%s", buf)

#define BTC_PRINT(dbgtype, dbgflag, printstr, ...) \
do { \
--
1.7.9.5


--
Kees Cook
Chrome OS Security


2014-07-01 18:30:16

by John W. Linville

[permalink] [raw]
Subject: Re: [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk

Please look in the git trees before reposting patches...

commit 6437f51ec36af8ef1e3e2659439b35c37e5498e2
Author: Kees Cook <[email protected]>
Date: Tue Jun 10 10:37:24 2014 -0700

rtlwifi: btcoexist: avoid format string in printk

Since CL_PRINTF only ever takes a single argument, make sure a format
string cannot leak into printk.

Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

On Mon, Jun 30, 2014 at 01:38:49PM -0700, Kees Cook wrote:
> Since CL_PRINTF only ever takes a single argument, make sure a format
> string cannot leak into printk.
>
> Signed-off-by: Kees Cook <[email protected]>
> ---
> .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
> index 871fc3c6d559..049f4c8d98a8 100644
> --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
> +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
> @@ -114,7 +114,7 @@ extern u32 btc_dbg_type[];
>
>
> #define CL_SPRINTF snprintf
> -#define CL_PRINTF printk
> +#define CL_PRINTF(buf) printk("%s", buf)
>
> #define BTC_PRINT(dbgtype, dbgflag, printstr, ...) \
> do { \
> --
> 1.7.9.5
>
>
> --
> Kees Cook
> Chrome OS Security
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2014-07-01 18:31:31

by Kees Cook

[permalink] [raw]
Subject: Re: [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk

On Tue, Jul 1, 2014 at 11:29 AM, John W. Linville
<[email protected]> wrote:
> Please look in the git trees before reposting patches...
>
> commit 6437f51ec36af8ef1e3e2659439b35c37e5498e2
> Author: Kees Cook <[email protected]>
> Date: Tue Jun 10 10:37:24 2014 -0700
>
> rtlwifi: btcoexist: avoid format string in printk
>
> Since CL_PRINTF only ever takes a single argument, make sure a format
> string cannot leak into printk.
>
> Signed-off-by: Kees Cook <[email protected]>
> Signed-off-by: John W. Linville <[email protected]>

Ah! Thanks very much. I hadn't gotten any email about it getting
applied, so I incorrectly assumed it hadn't been. :)

-Kees

>
> On Mon, Jun 30, 2014 at 01:38:49PM -0700, Kees Cook wrote:
>> Since CL_PRINTF only ever takes a single argument, make sure a format
>> string cannot leak into printk.
>>
>> Signed-off-by: Kees Cook <[email protected]>
>> ---
>> .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
>> index 871fc3c6d559..049f4c8d98a8 100644
>> --- a/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
>> +++ b/drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.h
>> @@ -114,7 +114,7 @@ extern u32 btc_dbg_type[];
>>
>>
>> #define CL_SPRINTF snprintf
>> -#define CL_PRINTF printk
>> +#define CL_PRINTF(buf) printk("%s", buf)
>>
>> #define BTC_PRINT(dbgtype, dbgflag, printstr, ...) \
>> do { \
>> --
>> 1.7.9.5
>>
>>
>> --
>> Kees Cook
>> Chrome OS Security
>>
>
> --
> John W. Linville Someday the world will need a hero, and you
> [email protected] might be all we have. Be ready.



--
Kees Cook
Chrome OS Security