openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NVMe: Prevent possible NULL pointer dereference 

kmalloc() used by the nvme_alloc_iod() to allocate memory for 'iod'
can fail. So check the return value.

Signed-off-by: Santosh Y <santosh.sy@samsung.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Santosh Y 2014-05-29 10:01:52 +05:30 committed by Matthew Wilcox
parent 4131f2fcdc
commit 6808c5fb7f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/nvme-core.c
View File

@ -1488,7 +1488,11 @@ struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
goto put_pages; goto put_pages;
} }
err = -ENOMEM;
iod = nvme_alloc_iod(count, length, GFP_KERNEL); iod = nvme_alloc_iod(count, length, GFP_KERNEL);
if (!iod)
goto put_pages;
sg = iod->sg; sg = iod->sg;
sg_init_table(sg, count); sg_init_table(sg, count);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@ -1501,7 +1505,6 @@ struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
sg_mark_end(&sg[i - 1]); sg_mark_end(&sg[i - 1]);
iod->nents = count; iod->nents = count;
err = -ENOMEM;
nents = dma_map_sg(&dev->pci_dev->dev, sg, count, nents = dma_map_sg(&dev->pci_dev->dev, sg, count,
write ? DMA_TO_DEVICE : DMA_FROM_DEVICE); write ? DMA_TO_DEVICE : DMA_FROM_DEVICE);
if (!nents) if (!nents)