Commit 76e1b656 authored Apr 15, 2015 by Julia Lawall Committed by Greg Hackmann Dec 09, 2015

UPSTREAM: zram: fix error return code

(cherry-pick from commit 201c7b72f0bf38d7f31fd229a01de035d0f10cd1)

Return a negative error code on failure.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}
// </smpl>

Bug: 25951511

Change-Id: I4a8efb09e4f249f517b74f421a796cf4b34fd170
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Acked-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cf89b85c

drivers/block/zram/zram_drv.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1171,6 +1171,7 @@ static int create_device(struct zram *zram, int device_id)
		if (!zram->disk) {
		pr_warn("Error allocating disk structure for device %d\n",
		device_id);
		ret = -ENOMEM;
		goto out_free_queue;
		}