From: Karel Zak <kzak@redhat.com>
Date: Wed, 17 Apr 2013 14:17:46 +0000 (+0200)
Subject: libblkid: use more robust code in silicon_raid checksum prober
X-Git-Tag: v2.23~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edb0b73d859cb2deac4076a4875cac8ef501656f;p=thirdparty%2Futil-linux.git

libblkid: use more robust code in silicon_raid checksum prober

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/silicon_raid.c b/libblkid/src/superblocks/silicon_raid.c
index a335cbc9ba..aeab4bf319 100644
--- a/libblkid/src/superblocks/silicon_raid.c
+++ b/libblkid/src/superblocks/silicon_raid.c
@@ -73,8 +73,10 @@ static int checksum(struct silicon_metadata *sil)
 	unsigned short count = offsetof(struct silicon_metadata, checksum1) / 2;
 	uint16_t *p = (uint16_t *) sil;
 
-	while (count--)
-		sum += le16_to_cpu(*p++);
+	while (count--) {
+		uint16_t x = *p++;
+		sum += le16_to_cpu(x);
+	}
 
 	return (-sum & 0xFFFF) == le16_to_cpu(sil->checksum1);
 }