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

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>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c
index 5864f987f206..9796284512a9 100644
--- a/drivers/scsi/bfa/bfad_im.c
+++ b/drivers/scsi/bfa/bfad_im.c
@@ -944,13 +944,15 @@ static int
 bfad_im_slave_alloc(struct scsi_device *sdev)
 {
         struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
-        struct bfad_itnim_data_s *itnim_data =
-                                (struct bfad_itnim_data_s *) rport->dd_data;
-        struct bfa_s *bfa = itnim_data->itnim->bfa_itnim->bfa;
+        struct bfad_itnim_data_s *itnim_data;
+        struct bfa_s *bfa;
 
         if (!rport || fc_remote_port_chkready(rport))
                 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) {
                 /*
                  * 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 */
         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);
         sprintf(fc_host_symbolic_name(host), "%s", symname);