Re: [PATCH] [SCSI] fusion: ensure NUL-termination ofMptCallbacksName elements

[Andrew Morton]

On Thu, 25 Aug 2011 14:44:57 +0200
Ferenc Wagner <wferi@xxxxxxx> wrote:

> Signed-off-by: Ferenc Wagner <wferi@xxxxxxx>

The lack of a changelog is a hint that the patch needed a changelog!

> 
> diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> index 7956a10..eb906e2 100644
> --- a/drivers/message/fusion/mptbase.c
> +++ b/drivers/message/fusion/mptbase.c
> @@ -113,7 +113,7 @@ 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;
> @@ -656,8 +656,7 @@ 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/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
> index fe90233..c10416d 100644
> --- a/drivers/message/fusion/mptbase.h
> +++ b/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

Does the patch fix some real-world observed problem?  If so, please
fully describe it.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/