]> www.infradead.org Git - nvme.git/commitdiff
nvmet: use kzalloc instead of ZERO_PAGE in nvme_execute_identify_ns_nvm()
authorNilay Shroff <nilay@linux.ibm.com>
Sun, 24 Nov 2024 12:55:53 +0000 (18:25 +0530)
committerKeith Busch <kbusch@kernel.org>
Mon, 2 Dec 2024 18:02:47 +0000 (10:02 -0800)
The nvme_execute_identify_ns_nvm function uses ZERO_PAGE for copying
SG list with all zeros. As ZERO_PAGE would not necessarily return the
virtual-address of the zero page, we need to first convert the page
address to kernel virtual-address and then use it as source address
for copying the data to SG list with all zeros. Using return address
of ZERO_PAGE(0) as source address for copying data to SG list would
fill the target buffer with random/garbage value and causes the
undesired side effect.

As other identify implemenations uses kzalloc for allocating a zero
filled buffer, we decided use kzalloc for allocating a zero filled
buffer in nvme_execute_identify_ns_nvm function and then use this
buffer for copying all zeros to SG list buffers. So esentially, we
now avoid using ZERO_PAGE.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Fixes: 64a51080eaba ("nvmet: implement id ns for nvm command set")
Link: https://lore.kernel.org/all/CAHj4cs8OVyxmn4XTvA=y4uQ3qWpdw-x3M3FSUYr-KpE-nhaFEA@mail.gmail.com/
Signed-off-by: Nilay Shroff <nilay@linux.ibm.com>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/target/admin-cmd.c

index 4fa8496a4d96752114522b5321ff83a953447ce5..2962794ce881ee6f9947e641dceeec937af002b4 100644 (file)
@@ -902,13 +902,18 @@ static void nvmet_execute_identify_ctrl_nvm(struct nvmet_req *req)
 static void nvme_execute_identify_ns_nvm(struct nvmet_req *req)
 {
        u16 status;
+       struct nvme_id_ns_nvm *id;
 
        status = nvmet_req_find_ns(req);
        if (status)
                goto out;
 
-       status = nvmet_copy_to_sgl(req, 0, ZERO_PAGE(0),
-                                  NVME_IDENTIFY_DATA_SIZE);
+       id = kzalloc(sizeof(*id), GFP_KERNEL);
+       if (!id) {
+               status = NVME_SC_INTERNAL;
+               goto out;
+       }
+       status = nvmet_copy_to_sgl(req, 0, id, sizeof(*id));
 out:
        nvmet_req_complete(req, status);
 }