nvme-fc: avoid null pointer dereference
Subsystems (2)
PATCH 1/2 nvme-fc: avoid null pointer dereference
Before using dynamically allcoated variable lsop in the nvme_fc_rcv_ls_req(), add a check for NULL and error out early.
--- drivers/nvme/host/fc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/nvme/host/fc.c +10 -1
@@ -1754,9 +1754,18 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, } lsop =kzalloc (sizeof (*lsop),GFP_KERNEL ); +if (!lsop) { +dev_info (lport->dev, +"RCV %s LS failed: No memory\n" , + (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? + nvmefc_ls_names[w0->ls_cmd] :"" ); + ret = -ENOMEM ; + goto out_put; + } + lsop->rqstbuf =kzalloc (sizeof (*lsop->rqstbuf),GFP_KERNEL ); lsop->rspbuf =kzalloc (sizeof (*lsop->rspbuf),GFP_KERNEL ); -if (!lsop || !lsop->rqstbuf || !lsop->rspbuf) { +if (!lsop->rqstbuf || !lsop->rspbuf) { dev_info(lport->dev, "RCV %s LS failed: No memory\n", (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
Signature · 1 line
2.29.0
PATCH 2/2 nvme-fc: move common code into helper
Add a helper to move the duplicate code for error message from nvme_fc_rcv_ls_req() to nvme_fc_rcv_ls_req_err_msg().
--- drivers/nvme/host/fc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/nvme/host/fc.c +11 -8
@@ -1701,6 +1701,15 @@ nvme_fc_handle_ls_rqst_work(struct work_struct *work)spin_unlock_irqrestore (&rport->lock, flags); } +static +void nvme_fc_rcv_ls_req_err_msg (struct nvme_fc_lport *lport, +struct fcnvme_ls_rqst_w0 *w0) +{ +dev_info (lport->dev,"RCV %s LS failed: No memory\n" , + (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? + nvmefc_ls_names[w0->ls_cmd] :"" ); +} +/** * nvme_fc_rcv_ls_req - transport entry point called by an LLDD * upon the reception of a NVME LS request.
@@ -1755,10 +1764,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, lsop =kzalloc (sizeof (*lsop),GFP_KERNEL );if (!lsop) { -dev_info (lport->dev, -"RCV %s LS failed: No memory\n" , - (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? - nvmefc_ls_names[w0->ls_cmd] :"" ); +nvme_fc_rcv_ls_req_err_msg (lport, w0); ret = -ENOMEM ; goto out_put; }
@@ -1766,10 +1772,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, lsop->rqstbuf =kzalloc (sizeof (*lsop->rqstbuf),GFP_KERNEL ); lsop->rspbuf =kzalloc (sizeof (*lsop->rspbuf),GFP_KERNEL );if (!lsop->rqstbuf || !lsop->rspbuf) { -dev_info (lport->dev, -"RCV %s LS failed: No memory\n" , - (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? - nvmefc_ls_names[w0->ls_cmd] :"" ); +nvme_fc_rcv_ls_req_err_msg (lport, w0); ret = -ENOMEM ; goto out_free; }
Signature · 1 line
2.29.0
Quoted 22 lines · Chaitanya Kulkarni
Before using dynamically allcoated variable lsop in the
nvme_fc_rcv_ls_req(), add a check for NULL and error out early.Signed-off-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/fc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/nvme/host/fc.c +6
-0@@ -1754,9 +1754,18 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, } lsop =kzalloc (sizeof (*lsop),GFP_KERNEL ); +if (!lsop) { +dev_info (lport->dev, +"RCV %s LS failed: No memory\n" , + (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? + nvmefc_ls_names[w0->ls_cmd] :"" ); + ret = -ENOMEM ;
drivers/nvme/host/fc.c nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, · line 1771
Quoted 10 lines
drivers/nvme/host/fc.c +4
-1+ goto out_put; + } + lsop->rqstbuf =kzalloc (sizeof (*lsop->rqstbuf),GFP_KERNEL ); lsop->rspbuf =kzalloc (sizeof (*lsop->rspbuf),GFP_KERNEL ); -if (!lsop || !lsop->rqstbuf || !lsop->rspbuf) { +if (!lsop->rqstbuf || !lsop->rspbuf) { dev_info(lport->dev, "RCV %s LS failed: No memory\n", (w0->ls_cmd <= NVME_FC_LAST_LS_CMD_VALUE) ?
Looks good
-- james
Re: [PATCH 2/2] nvme-fc: move common code into helper
In reply to Chaitanya KulkarniQuoted 42 lines · Chaitanya Kulkarni
Add a helper to move the duplicate code for error message from
nvme_fc_rcv_ls_req()tonvme_fc_rcv_ls_req_err_msg().Signed-off-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/fc.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)drivers/nvme/host/fc.c +10
-4@@ -1701,6 +1701,15 @@ nvme_fc_handle_ls_rqst_work(struct work_struct *work)spin_unlock_irqrestore (&rport->lock, flags); } +static +void nvme_fc_rcv_ls_req_err_msg (struct nvme_fc_lport *lport, +struct fcnvme_ls_rqst_w0 *w0) +{ +dev_info (lport->dev,"RCV %s LS failed: No memory\n" , + (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? + nvmefc_ls_names[w0->ls_cmd] :"" ); +} +/** * nvme_fc_rcv_ls_req - transport entry point called by an LLDD * upon the reception of a NVME LS request. @@ -1755,10 +1764,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, lsop =kzalloc (sizeof (*lsop),GFP_KERNEL );if (!lsop) { -dev_info (lport->dev, -"RCV %s LS failed: No memory\n" , - (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? - nvmefc_ls_names[w0->ls_cmd] :"" ); +nvme_fc_rcv_ls_req_err_msg (lport, w0); ret = -ENOMEM ; goto out_put; }@@ -1766,10 +1772,7 @@ nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, lsop->rqstbuf =kzalloc (sizeof (*lsop->rqstbuf),GFP_KERNEL );
drivers/nvme/host/fc.c nvme_fc_rcv_ls_req(struct nvme_fc_remote_port *portptr, · line 1778
Quoted 10 lines
drivers/nvme/host/fc.c +1
-4lsop->rspbuf =kzalloc (sizeof (*lsop->rspbuf),GFP_KERNEL );if (!lsop->rqstbuf || !lsop->rspbuf) { -dev_info (lport->dev, -"RCV %s LS failed: No memory\n" , - (w0->ls_cmd <=NVME_FC_LAST_LS_CMD_VALUE ) ? - nvmefc_ls_names[w0->ls_cmd] :"" ); +nvme_fc_rcv_ls_req_err_msg (lport, w0); ret = -ENOMEM ; goto out_free; }
OK
-- james
Thanks, applied both patches to nvme-6.2.