[PATCH v2] staging: wlags49_h2: strncpy, need checking the memory length

Chen Gang gang.chen at asianux.com
Tue May 14 06:01:50 UTC 2013


HCF_MAX_NAME_LEN is 32, which may less than ''probe_rsp->rawData[1]'',
so need check the length when copy to ssid.

Type of 'probe_rsp->rawData[1]' is 'hcf_8' which is 'unsigned char',
better to cast to 'unsigned int' firstly, and then cast to 'int'.

For compiling, 'min()' is defined in include/linux/kernel.h, it has
'(void) (&_min1 == &_min2);', so if no type cast, the compiler will
report 'pointer types lacks a cast':

  drivers/staging/wlags49_h2/wl_main.c:3174:122: warning: comparison of distinct pointer types lacks a cast [enabled by default]


Signed-off-by: Chen Gang <gang.chen at asianux.com>
---
 drivers/staging/wlags49_h2/wl_main.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index f28f15b..7fd5858 100644
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -3171,7 +3171,9 @@ void wl_process_mailbox( struct wl_private *lp )
 
 					memset( ssid, 0, sizeof( ssid ));
 					strncpy( ssid, &probe_rsp->rawData[2],
-							 probe_rsp->rawData[1] );
+						 min((int)(unsigned int)
+							probe_rsp->rawData[1],
+							HCF_MAX_NAME_LEN - 1));
 
 					DBG_TRACE( DbgInfo, "(%s) SSID        : %s\n",
 							   lp->dev->name, ssid );
-- 
1.7.7.6



More information about the devel mailing list