1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 3feeb447b740..b6fa257ea3e0 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -5173,7 +5173,6 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 rjt_err = LSRJT_CMD_UNSUPPORTED;
                 goto rjt;
         }
-        lcb_context = kmalloc(sizeof(struct lpfc_lcb_context), GFP_KERNEL);
 
         if (phba->hba_flag & HBA_FCOE_MODE) {
                 rjt_err = LSRJT_CMD_UNSUPPORTED;
@@ -5204,6 +5203,12 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
                 goto rjt;
         }
 
+        lcb_context = kmalloc(sizeof(*lcb_context), GFP_KERNEL);
+        if (!lcb_context) {
+                rjt_err = LSRJT_UNABLE_TPC;
+                goto rjt;
+        }
+
         state = (beacon->lcb_sub_command == LPFC_LCB_ON) ? 1 : 0;
         lcb_context->sub_command = beacon->lcb_sub_command;
         lcb_context->type = beacon->lcb_type;
@@ -5214,6 +5219,7 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
         if (lpfc_sli4_set_beacon(vport, lcb_context, state)) {
                 lpfc_printf_vlog(ndlp->vport, KERN_ERR,
                                  LOG_ELS, "0193 failed to send mail box");
+                kfree(lcb_context);
                 lpfc_nlp_put(ndlp);
                 rjt_err = LSRJT_UNABLE_TPC;
                 goto rjt;