netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk
@ 2014-06-30 20:38 Kees Cook
  2014-07-01 18:29 ` John W. Linville
  0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2014-06-30 20:38 UTC (permalink / raw)
  To: linux-kernel
  Cc: Larry Finger, Chaoming Li, John W. Linville, Greg Kroah-Hartman,
	linux-wireless, netdev

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

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 .../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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk
  2014-06-30 20:38 [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk Kees Cook
@ 2014-07-01 18:29 ` John W. Linville
  2014-07-01 18:31   ` Kees Cook
  0 siblings, 1 reply; 3+ messages in thread
From: John W. Linville @ 2014-07-01 18:29 UTC (permalink / raw)
  To: Kees Cook
  Cc: linux-kernel, Larry Finger, Chaoming Li, Greg Kroah-Hartman,
	linux-wireless, netdev

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

commit 6437f51ec36af8ef1e3e2659439b35c37e5498e2
Author: Kees Cook <keescook@chromium.org>
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 <keescook@chromium.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

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 <keescook@chromium.org>
> ---
>  .../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
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk
  2014-07-01 18:29 ` John W. Linville
@ 2014-07-01 18:31   ` Kees Cook
  0 siblings, 0 replies; 3+ messages in thread
From: Kees Cook @ 2014-07-01 18:31 UTC (permalink / raw)
  To: John W. Linville
  Cc: LKML, Larry Finger, Chaoming Li, Greg Kroah-Hartman,
	linux-wireless, Network Development

On Tue, Jul 1, 2014 at 11:29 AM, John W. Linville
<linville@tuxdriver.com> wrote:
> Please look in the git trees before reposting patches...
>
> commit 6437f51ec36af8ef1e3e2659439b35c37e5498e2
> Author: Kees Cook <keescook@chromium.org>
> 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 <keescook@chromium.org>
>     Signed-off-by: John W. Linville <linville@tuxdriver.com>

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 <keescook@chromium.org>
>> ---
>>  .../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
> linville@tuxdriver.com                  might be all we have.  Be ready.



-- 
Kees Cook
Chrome OS Security

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-01 18:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-30 20:38 [RESEND][PATCH] rtlwifi: btcoexist: avoid format string in printk Kees Cook
2014-07-01 18:29 ` John W. Linville
2014-07-01 18:31   ` Kees Cook

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).