lkml.org 
[lkml]   [2009]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] ima: hashing large files bug fix
On Fri, 21 Aug 2009, Mimi Zohar wrote:

> Hashing files larger than INT_MAX causes process to loop.
> Dependent on redefining kernel_read() offset type to loff_t.
>
> (http://bugzilla.kernel.org/show_bug.cgi?id=13909)
>
> Cc: stable@kernel.org
> Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
> ---
> security/integrity/ima/ima_crypto.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)

These look correct to me (I'll also push them to Linus via git).

Reviewed-by: James Morris <jmorris@namei.org>

>
> diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
> index 63003a6..46642a1 100644
> --- a/security/integrity/ima/ima_crypto.c
> +++ b/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);
>
> --
> 1.6.0.6
>

--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2009-08-24 07:01    [W:0.022 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site