From: Dan Carpenter Date: Fri, 9 Oct 2015 06:41:22 +0000 (+0300) Subject: misc: mic/scif: fix error code in scif_create_remote_lookup() X-Git-Tag: firefly_0821_release~176^2~800^2~43 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e426115e0ad35513d88a3e423b86f839b02f17b5;p=firefly-linux-kernel-4.4.55.git misc: mic/scif: fix error code in scif_create_remote_lookup() We should be returning -ENOMEM here instead of success. Fixes: ba612aa8b487 ('misc: mic: SCIF memory registration and unregistration') Signed-off-by: Dan Carpenter Reviewed-by: Sudeep Dutt Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c index 980ef13b4cf6..8310b4dbff06 100644 --- a/drivers/misc/mic/scif/scif_rma.c +++ b/drivers/misc/mic/scif/scif_rma.c @@ -386,16 +386,20 @@ static int scif_create_remote_lookup(struct scif_dev *remote_dev, remote_dev, window->nr_lookup * sizeof(*window->dma_addr_lookup.lookup), GFP_KERNEL | __GFP_ZERO); - if (!window->dma_addr_lookup.lookup) + if (!window->dma_addr_lookup.lookup) { + err = -ENOMEM; goto error_window; + } window->num_pages_lookup.lookup = scif_alloc_coherent(&window->num_pages_lookup.offset, remote_dev, window->nr_lookup * sizeof(*window->num_pages_lookup.lookup), GFP_KERNEL | __GFP_ZERO); - if (!window->num_pages_lookup.lookup) + if (!window->num_pages_lookup.lookup) { + err = -ENOMEM; goto error_window; + } vmalloc_dma_phys = is_vmalloc_addr(&window->dma_addr[0]); vmalloc_num_pages = is_vmalloc_addr(&window->num_pages[0]);