On Mon, Dec 22, 2014 at 2:52 PM, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> wrote: > 2014-08-01 0:19 GMT+02:00 adam radford <aradford@xxxxxxxxx>: >> On Sun, Jul 27, 2014 at 8:11 AM, Rickard Strandqvist >> <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> wrote: >>> Replacing strncpy with strlcpy to avoid strings that lacks null terminate. >>> And use the sizeof on the to string rather than strlen on the from string. >>> >>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> >>> --- >>> drivers/scsi/3w-9xxx.c | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c >>> index 0a73253..f4d2331 100644 >>> --- a/drivers/scsi/3w-9xxx.c >>> +++ b/drivers/scsi/3w-9xxx.c >>> @@ -621,7 +621,8 @@ static int twa_check_srl(TW_Device_Extension *tw_dev, int *flashed) >>> } >>> >>> /* Load rest of compatibility struct */ >>> - strncpy(tw_dev->tw_compat_info.driver_version, TW_DRIVER_VERSION, strlen(TW_DRIVER_VERSION)); >>> + strlcpy(tw_dev->tw_compat_info.driver_version, TW_DRIVER_VERSION, >>> + sizeof(tw_dev->tw_compat_info.driver_version)); >>> tw_dev->tw_compat_info.driver_srl_high = TW_CURRENT_DRIVER_SRL; >>> tw_dev->tw_compat_info.driver_branch_high = TW_CURRENT_DRIVER_BRANCH; >>> tw_dev->tw_compat_info.driver_build_high = TW_CURRENT_DRIVER_BUILD; >>> -- >>> 1.7.10.4 >>> >>> -- >>> 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/ >> >> Rickard, >> >> This patch looks fine. >> >> Acked-by: Adam Radford <aradford@xxxxxxxxx> >> >> -Adam > > > Hi Adam! > > What happened to this patch? It just didn't get picked up into scsi.git/for-next for some reason. All I can do is Ack it, which I already did :) -Adam -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
