linux.git/security/integrity/ima, branch v3.15

ima: skip memory allocation for empty files

2014-03-07T17:15:48+00:00

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

Signed-off-by: Dmitry Kasatkin 
Signed-off-by: Mimi Zohar

ima: return d_name.name if d_path fails

2014-03-07T17:15:46+00:00

This is a small refactoring so ima_d_path() returns dentry name
if path reconstruction fails. It simplifies callers actions
and removes code duplication.

Signed-off-by: Dmitry Kasatkin 
Signed-off-by: Mimi Zohar

integrity: fix checkpatch errors

2014-03-07T17:15:45+00:00

Between checkpatch changes (eg. sizeof) and inconsistencies between
Lindent and checkpatch, unfixed checkpatch errors make it difficult
to see new errors. This patch fixes them. Some lines with over 80 chars
remained unchanged to improve code readability.

The "extern" keyword is removed from internal evm.h to make it consistent
with internal ima.h.

Signed-off-by: Dmitry Kasatkin 
Signed-off-by: Mimi Zohar

ima: fix erroneous removal of security.ima xattr

2014-03-07T17:15:44+00:00

ima_inode_post_setattr() calls ima_must_appraise() to check if the
file needs to be appraised. If it does not then it removes security.ima
xattr. With original policy matching code it might happen that even
file needs to be appraised with FILE_CHECK hook, it might not be
for POST_SETATTR hook. 'security.ima' might be erronously removed.

This patch treats POST_SETATTR as special wildcard function and will
cause ima_must_appraise() to be true if any of the hooks rules matches.
security.ima will not be removed if any of the hooks would require
appraisal.

Signed-off-by: Dmitry Kasatkin 
Signed-off-by: Mimi Zohar

security: integrity: Use a more current logging style

2014-03-07T17:15:21+00:00

Convert printks to pr_.
Add pr_fmt.
Remove embedded prefixes.

Signed-off-by: Joe Perches 
Signed-off-by: Mimi Zohar

ima: reduce memory usage when a template containing the n field is used

2014-03-07T16:32:30+00:00

Before this change, to correctly calculate the template digest for the
'ima' template, the event name field (id: 'n') length was set to the fixed
size of 256 bytes.

This patch reduces the length of the event name field to the string
length incremented of one (to make room for the termination character '\0')
and handles the specific case of the digest calculation for the 'ima'
template directly in ima_calc_field_array_hash_tfm().

Signed-off-by: Roberto Sassu 
Signed-off-by: Mimi Zohar

ima: restore the original behavior for sending data with ima template

2014-03-07T16:32:29+00:00

With the new template mechanism introduced in IMA since kernel 3.13,
the format of data sent through the binary_runtime_measurements interface
is slightly changed. Now, for a generic measurement, the format of
template data (after the template name) is:

template_len | field1_len | field1 | ... | fieldN_len | fieldN

In addition, fields containing a string now include the '\0' termination
character.

Instead, the format for the 'ima' template should be:

SHA1 digest | event name length | event name

It must be noted that while in the IMA 3.13 code 'event name length' is
'IMA_EVENT_NAME_LEN_MAX + 1' (256 bytes), so that the template digest
is calculated correctly, and 'event name' contains '\0', in the pre 3.13
code 'event name length' is exactly the string length and 'event name'
does not contain the termination character.

The patch restores the behavior of the IMA code pre 3.13 for the 'ima'
template so that legacy userspace tools obtain a consistent behavior
when receiving data from the binary_runtime_measurements interface
regardless of which kernel version is used.

Signed-off-by: Roberto Sassu 
Cc:  # 3.3.13: 3ce1217 ima: define template fields library
Signed-off-by: Mimi Zohar

ima: use static const char array definitions

2014-03-07T16:30:36+00:00

A const char pointer allocates memory for a pointer as well as for
a string,  This patch replaces a number of the const char pointers
throughout IMA, with a static const char array.

Suggested-by: David Howells 
Signed-off-by: Mimi Zohar 
Acked-by: David Howells

ima: new helper: file_inode(file)

2014-03-04T21:53:03+00:00

Replace "file->f_dentry->d_inode" with the new file_inode() helper
function.

Signed-off-by: Libo Chen 
Signed-off-by: Mimi Zohar

security: replace strict_strto() with kstrto()

2014-02-06T08:11:04+00:00

The usage of strict_strto*() is not preferred, because
strict_strto*() is obsolete. Thus, kstrto*() should be
used.

Signed-off-by: Jingoo Han 
Signed-off-by: James Morris