From 39f0198613790de9b85eb12de0a23975578b35b1 Mon Sep 17 00:00:00 2001 From: Ferenc Wagner Date: Thu, 25 Aug 2011 14:44:57 +0200 Subject: [PATCH] --- yaml --- r: 282245 b: refs/heads/master c: 8af3d8d5bc75914a01fe41839474902f2c6b79b9 h: refs/heads/master i: 282243: 44024f10a33a6214e40d0415b53140aa80cd9d4e v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptbase.c | 7 ++++--- trunk/drivers/message/fusion/mptbase.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 73be8b4a91e9..b164c1670142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd6dbb038a191b1bea34819de547f66a2187e309 +refs/heads/master: 8af3d8d5bc75914a01fe41839474902f2c6b79b9 diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c index e9c6a6047a00..a7dc4672d996 100644 --- a/trunk/drivers/message/fusion/mptbase.c +++ b/trunk/drivers/message/fusion/mptbase.c @@ -115,7 +115,8 @@ module_param(mpt_fwfault_debug, int, 0600); MODULE_PARM_DESC(mpt_fwfault_debug, "Enable detection of Firmware fault and halt Firmware on fault - (default=0)"); -static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50]; +static char MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS] + [MPT_MAX_CALLBACKNAME_LEN+1]; #ifdef MFCNT static int mfcounter = 0; @@ -717,8 +718,8 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name) MptDriverClass[cb_idx] = dclass; MptEvHandlers[cb_idx] = NULL; last_drv_idx = cb_idx; - memcpy(MptCallbacksName[cb_idx], func_name, - strlen(func_name) > 50 ? 50 : strlen(func_name)); + strlcpy(MptCallbacksName[cb_idx], func_name, + MPT_MAX_CALLBACKNAME_LEN+1); break; } } diff --git a/trunk/drivers/message/fusion/mptbase.h b/trunk/drivers/message/fusion/mptbase.h index b4d24dc081ae..76c05bc24cb7 100644 --- a/trunk/drivers/message/fusion/mptbase.h +++ b/trunk/drivers/message/fusion/mptbase.h @@ -89,6 +89,7 @@ */ #define MPT_MAX_ADAPTERS 18 #define MPT_MAX_PROTOCOL_DRIVERS 16 +#define MPT_MAX_CALLBACKNAME_LEN 49 #define MPT_MAX_BUS 1 /* Do not change */ #define MPT_MAX_FC_DEVICES 255 #define MPT_MAX_SCSI_DEVICES 16