android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ima: skip memory allocation for empty files

Browse Source 
Memory allocation is unnecessary for empty files.
This patch calculates the hash without memory allocation.

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
This commit is contained in:
Dmitry Kasatkin 2014-02-27 20:16:47 +02:00 committed by Mimi Zohar
parent e0420039b6
commit 1d91ac6213
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/integrity/ima/ima_crypto.c
View File

@ -87,16 +87,20 @@ static int ima_calc_file_hash_tfm(struct file *file,
if (rc != 0) if (rc != 0)
return rc; return rc;
rbuf = kzalloc(PAGE_SIZE, GFP_KERNEL); i_size = i_size_read(file_inode(file));
if (!rbuf) {
rc = -ENOMEM; if (i_size == 0)
goto out; goto out;
}
rbuf = kzalloc(PAGE_SIZE, GFP_KERNEL);
if (!rbuf)
return -ENOMEM;
if (!(file->f_mode & FMODE_READ)) { if (!(file->f_mode & FMODE_READ)) {
file->f_mode |= FMODE_READ; file->f_mode |= FMODE_READ;
read = 1; read = 1;
} }
i_size = i_size_read(file_inode(file));
while (offset < i_size) { while (offset < i_size) {
int rbuf_len; int rbuf_len;
@ -113,12 +117,12 @@ static int ima_calc_file_hash_tfm(struct file *file,
if (rc) if (rc)
break; break;
} }
kfree(rbuf);
if (!rc)
rc = crypto_shash_final(&desc.shash, hash->digest);
if (read) if (read)
file->f_mode &= ~FMODE_READ; file->f_mode &= ~FMODE_READ;
kfree(rbuf);
out: out:
if (!rc)
rc = crypto_shash_final(&desc.shash, hash->digest);
return rc; return rc;
} }