From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 28 Jan 2014 12:31:28 +0000 (+0100)
Subject: xen/unlz4: always set an error return code on failures
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5642
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55d207597e05b79fb0d90868abfe0f77b3ba66f2;p=xen.git

xen/unlz4: always set an error return code on failures

"ret", being set to -1 early on, gets cleared by the first invocation
of lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence
subsequent failures wouldn't be noticed by the caller without setting
it back to -1 right after those calls.

Linux commit: 2a1d689c9ba42a6066540fb221b6ecbd6298b728

Reported-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/unlz4.c b/xen/common/unlz4.c
index 195d8299a2..9dcaec7e84 100644
--- a/xen/common/unlz4.c
+++ b/xen/common/unlz4.c
@@ -133,6 +133,7 @@ STATIC int INIT unlz4(unsigned char *input, unsigned int in_len,
 			goto exit_2;
 		}
 
+		ret = -1;
 		if (flush && flush(outp, dest_len) != dest_len)
 			goto exit_2;
 		if (output)