2014-07-26 22:28:39

by Rickard Strandqvist

[permalink] [raw]
Subject: [PATCH] scsi: scsi_tgt_if.c: Cleaning up missing null-terminate in conjunction with strncpy

If you are going to use memset before strncpy you must copy sizeof -1

Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/scsi/scsi_tgt_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c
index 6209110..7dc98eb 100644
--- a/drivers/scsi/scsi_tgt_if.c
+++ b/drivers/scsi/scsi_tgt_if.c
@@ -190,7 +190,7 @@ int scsi_tgt_uspace_send_it_nexus_request(int host_no, u64 itn_id,
ev.p.it_nexus_req.itn_id = itn_id;
if (initiator_id)
strncpy(ev.p.it_nexus_req.initiator_id, initiator_id,
- sizeof(ev.p.it_nexus_req.initiator_id));
+ sizeof(ev.p.it_nexus_req.initiator_id) - 1);

dprintk("%d %x %llx\n", host_no, function, (unsigned long long)itn_id);

--
1.7.10.4