---

yaml --- r: 157011 b: refs/heads/master c: 16bfa38 h: refs/heads/master i: 157009: eeb55ef 157007: 76fd4ca v: v3
git-mirror · Aug 24, 2009 · 748fd8f · 748fd8f
1 parent a453c42
commit 748fd8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6777d773a463ac045d333b989d4e44660f8d92ad
+refs/heads/master: 16bfa38b1936212428cb38fbfbbb8f6c62b8d81f
diff --git a/trunk/security/integrity/ima/ima_crypto.c b/trunk/security/integrity/ima/ima_crypto.c
@@ -45,9 +45,9 @@ int ima_calc_hash(struct file *file, char *digest)
 {
 	struct hash_desc desc;
 	struct scatterlist sg[1];
-	loff_t i_size;
+	loff_t i_size, offset = 0;
 	char *rbuf;
-	int rc, offset = 0;
+	int rc;
 
 	rc = init_desc(&desc);
 	if (rc != 0)
@@ -67,6 +67,8 @@ int ima_calc_hash(struct file *file, char *digest)
 			rc = rbuf_len;
 			break;
 		}
+		if (rbuf_len == 0)
+			break;
 		offset += rbuf_len;
 		sg_init_one(sg, rbuf, rbuf_len);