lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 31 Jul 2014 15:19:01 -0700 From: adam radford <aradford@...il.com> To: Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> Cc: Adam Radford <linuxraid@....com>, "James E.J. Bottomley" <JBottomley@...allels.com>, linux-scsi <linux-scsi@...r.kernel.org>, linux-kernel <linux-kernel@...r.kernel.org> Subject: Re: [PATCH] scsi: 3w-9xxx.c: Cleaning up missing null-terminate in conjunction with strncpy On Sun, Jul 27, 2014 at 8:11 AM, Rickard Strandqvist <rickard_strandqvist@...ctrumdigital.se> 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@...ctrumdigital.se> > --- > 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@...r.kernel.org > 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@...il.com> -Adam -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists