diff options
| author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-07-27 15:11:18 (GMT) |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-01-09 14:44:21 (GMT) |
| commit | 2195d9690464445d0c30ee8170030a8e696f2053 (patch) | |
| tree | 78b23c3ffd65f7a12bb14992231b92521a44ae12 | |
| parent | acafd0b920e1a4a94a03f1911b4fb87e2081f235 (diff) | |
| download | linux-2195d9690464445d0c30ee8170030a8e696f2053.tar.xz | |
3w-9xxx.c: Cleaning up missing null-terminate in conjunction with strncpy
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@spectrumdigital.se>
Acked-by: Adam Radford <aradford@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/3w-9xxx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index cd4129f..7600639 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c @@ -608,7 +608,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; |