From a83aba9a63476996d11053b8436d8cd39b4c2aa1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 20 Jun 2015 16:29:14 +0800 Subject: [PATCH] block: nvme-scsi: Catch kcalloc failure res variable was initialized to -ENOMEM, but it's override by nvme_trans_copy_from_user(). So current code returns 0 if kcalloc fails. Fix it to return proper error code. Signed-off-by: Axel Lin Signed-off-by: Jens Axboe (cherry picked from commit 51ef72bda70841fddd595142ed0e7e0fc571c500) Orabug: 22620486 Signed-off-by: Jason Luo --- drivers/block/nvme-scsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index a0fade9c6bd27..e5a63f06fb0f7 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c @@ -2377,7 +2377,7 @@ static int nvme_trans_unmap(struct nvme_ns *ns, struct sg_io_hdr *hdr, struct scsi_unmap_parm_list *plist; struct nvme_dsm_range *range; struct nvme_command c; - int i, nvme_sc, res = -ENOMEM; + int i, nvme_sc, res; u16 ndesc, list_len; list_len = get_unaligned_be16(&cmd[7]); @@ -2399,8 +2399,10 @@ static int nvme_trans_unmap(struct nvme_ns *ns, struct sg_io_hdr *hdr, } range = kcalloc(ndesc, sizeof(*range), GFP_KERNEL); - if (!range) + if (!range) { + res = -ENOMEM; goto out; + } for (i = 0; i < ndesc; i++) { range[i].nlb = cpu_to_le32(be32_to_cpu(plist->desc[i].nlb)); -- 2.50.1