linux-stable.git/security/integrity/ima/ima_template_lib.c, branch linux-4.2.y

ima: fix ima_show_template_data_ascii()

2015-06-16T12:18:21+00:00

This patch fixes a bug introduced in "4d7aeee ima: define new template
ima-ng and template fields d-ng and n-ng".

Changelog:
- change int to uint32 (Roberto Sassu's suggestion)

Signed-off-by: Mimi Zohar 
Signed-off-by: Roberto Sassu 
Cc: stable@vger.kernel.org # 3.13

ima: pass iint to ima_add_violation()

2015-05-21T17:59:29+00:00

This patch adds the iint associated to the current inode as a new
parameter of ima_add_violation(). The passed iint is always not NULL
if a violation is detected. This modification will be used to determine
the inode for which there is a violation.

Since the 'd' and 'd-ng' template field init() functions were detecting
a violation from the value of the iint pointer, they now check the new
field 'violation', added to the 'ima_event_data' structure.

Changelog:
 - v1:
   - modified an old comment (Roberto Sassu)

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

ima: wrap event related data to the new ima_event_data structure

2015-05-21T17:59:28+00:00

All event related data has been wrapped into the new 'ima_event_data'
structure. The main benefit of this patch is that a new information
can be made available to template fields initialization functions
by simply adding a new field to the new structure instead of modifying
the definition of those functions.

Changelog:
 - v2:
   - f_dentry replaced with f_path.dentry (Roberto Sassu)
   - removed declaration of temporary variables in template field functions
     when possible (suggested by Dmitry Kasatkin)

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

kill f_dentry uses

2014-11-19T18:01:25+00:00

Signed-off-by: Al Viro

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

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

2014-01-06T11:23:01+00:00

ima: remove unneeded size_limit argument from ima_eventdigest_init_common()

2014-01-03T12:43:00+00:00

This patch removes the 'size_limit' argument from
ima_eventdigest_init_common(). Since the 'd' field will never include
the hash algorithm as prefix and the 'd-ng' will always have it, we can
use the hash algorithm to differentiate the two cases in the modified
function (it is equal to HASH_ALGO__LAST in the first case, the opposite
in the second).

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

ima: pass HASH_ALGO__LAST as hash algo in ima_eventdigest_init()

2014-01-03T12:42:59+00:00

Replace the '-1' value with HASH_ALGO__LAST in ima_eventdigest_init()
as the called function ima_eventdigest_init_common() expects an unsigned
char.

Fix commit:
  4d7aeee ima: define new template ima-ng and template fields d-ng and n-ng

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

ima: change the default hash algorithm to SHA1 in ima_eventdigest_ng_init()

2014-01-03T12:42:57+00:00

Replace HASH_ALGO__LAST with HASH_ALGO_SHA1 as the initial value of
the hash algorithm so that the prefix 'sha1:' is added to violation
digests.

Fix commit:
  4d7aeee ima: define new template ima-ng and template fields d-ng and n-ng

Signed-off-by: Roberto Sassu 
Cc:  # 3.13.x
Signed-off-by: Mimi Zohar