lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] bfa: Fixes for 0-terminated strncpy and possible null pointer dereference

Browse Source 
This patch fixes two cppcheck errors in drivers/scsi/bfa/bfad_im.c

[jejb: correct strlcpy fix]
Signed-off-by: Jakob Normark <jakobnormark@gmail.com>
Acked-by: Vijay Mohan Guvva <vmohan@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Jakob Normark
2013-05-15 21:41:51 +02:00
committed by James Bottomley
parent 7525be545c
commit c6e23d83c3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/bfa/bfad_im.c
View File

@@ -944,13 +944,15 @@ static int
bfad_im_slave_alloc(struct scsi_device *sdev) bfad_im_slave_alloc(struct scsi_device *sdev)
{ {
struct fc_rport *rport = starget_to_rport(scsi_target(sdev)); struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
struct bfad_itnim_data_s *itnim_data = struct bfad_itnim_data_s *itnim_data;
(struct bfad_itnim_data_s *) rport->dd_data; struct bfa_s *bfa;
struct bfa_s *bfa = itnim_data->itnim->bfa_itnim->bfa;
if (!rport || fc_remote_port_chkready(rport)) if (!rport || fc_remote_port_chkready(rport))
return -ENXIO; return -ENXIO;
itnim_data = (struct bfad_itnim_data_s *) rport->dd_data;
bfa = itnim_data->itnim->bfa_itnim->bfa;
if (bfa_get_lun_mask_status(bfa) == BFA_LUNMASK_ENABLED) { if (bfa_get_lun_mask_status(bfa) == BFA_LUNMASK_ENABLED) {
/* /*
* We should not mask LUN 0 - since this will translate * We should not mask LUN 0 - since this will translate
@@ -1035,7 +1037,7 @@ bfad_fc_host_init(struct bfad_im_port_s *im_port)
/* For fibre channel services type 0x20 */ /* For fibre channel services type 0x20 */
fc_host_supported_fc4s(host)[7] = 1; fc_host_supported_fc4s(host)[7] = 1;
strncpy(symname, bfad->bfa_fcs.fabric.bport.port_cfg.sym_name.symname, strlcpy(symname, bfad->bfa_fcs.fabric.bport.port_cfg.sym_name.symname,
BFA_SYMNAME_MAXLEN); BFA_SYMNAME_MAXLEN);
sprintf(fc_host_symbolic_name(host), "%s", symname); sprintf(fc_host_symbolic_name(host), "%s", symname);