Gitweb: http://git.kernel.org/linus/0da0a420bb542b13ebae142109a9d2045ade0cb1
Commit: 0da0a420bb542b13ebae142109a9d2045ade0cb1
Parent: 251a2a958b0455d11b711aeeb57cabad66259461
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
AuthorDate: Thu Feb 19 21:23:50 2009 -0500
Committer: James Morris <jmorris@namei.org>
CommitDate: Sat Feb 21 00:29:59 2009 +1100
integrity: ima scatterlist bug fix
Based on Alexander Beregalov's post http://lkml.org/lkml/2009/2/19/198
- replaced sg_set_buf() with sg_init_one()
kernel BUG at include/linux/scatterlist.h:65!
invalid opcode: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
last sysfs file:
CPU 2
Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.29-rc5-next-20090219 #5 PowerEdge 1950
RIP: 0010:[<ffffffff8045ec70>] [<ffffffff8045ec70>] ima_calc_hash+0xc0/0x160
RSP: 0018:ffff88007f46bc40 EFLAGS: 00010286
RAX: ffffe200032c45e8 RBX: 00000000fffffff4 RCX: 0000000087654321
RDX: 0000000000000002 RSI: 0000000000000001 RDI: ffff88007cf71048
RBP: ffff88007f46bcd0 R08: 0000000000000000 R09: 0000000000000163
R10: ffff88007f4707a8 R11: 0000000000000000 R12: ffff88007cf71048
R13: 0000000000001000 R14: 0000000000000000 R15: 0000000000009d98
FS: 0000000000000000(0000) GS:ffff8800051ac000(0000) knlGS:0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b
CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Tested-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: James Morris <jmorris@namei.org>
---
security/integrity/ima/ima_crypto.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
index c2a46e4..50d572b 100644
--- a/security/integrity/ima/ima_crypto.c
+++ b/security/integrity/ima/ima_crypto.c
@@ -68,7 +68,7 @@ int ima_calc_hash(struct file *file, char *digest)
break;
}
offset += rbuf_len;
- sg_set_buf(sg, rbuf, rbuf_len);
+ sg_init_one(sg, rbuf, rbuf_len);
rc = crypto_hash_update(&desc, sg, rbuf_len);
if (rc)
@@ -95,7 +95,7 @@ int ima_calc_template_hash(int template_len, void *template, char *digest)
if (rc != 0)
return rc;
- sg_set_buf(sg, template, template_len);
+ sg_init_one(sg, template, template_len);
rc = crypto_hash_update(&desc, sg, template_len);
if (!rc)
rc = crypto_hash_final(&desc, digest);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
