From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 17 Jun 2016 08:22:22 +0000 (+0200)
Subject: APEI: pull a signedness check ahead for Coverity's sake
X-Git-Tag: 4.8.0-rc1~734
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0961444c07f57a43fed6788e2df90e43b51cdb06;p=xen.git

APEI: pull a signedness check ahead for Coverity's sake

On 64-bit architectures (which is all we care about right now in ACPI
code), the value coming from a __u32 field makes "len" positive anyway,
but since from an abstract pov the tool is right, let's just re-order
things.

Coverity ID: 1204965

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/drivers/acpi/apei/erst.c b/xen/drivers/acpi/apei/erst.c
index 8d721d05e6..14acf5d773 100644
--- a/xen/drivers/acpi/apei/erst.c
+++ b/xen/drivers/acpi/apei/erst.c
@@ -672,9 +672,11 @@ static ssize_t __erst_read(u64 record_id, struct cper_record_header *record,
 	if (rcd_tmp->record_length > buflen)
 		return -ENOBUFS;
 	len = rcd_tmp->record_length;
+	if (len < 0)
+		return -ERANGE;
 	memcpy(record, rcd_tmp, len);
 
-	return len >= 0 ? len : -ERANGE;
+	return len;
 }
 
 /*