diff options
| author | Thiago Jung Bauermann | 2017-06-08 03:49:10 +0200 |
|---|---|---|
| committer | Mimi Zohar | 2017-06-21 20:37:12 +0200 |
| commit | bb543e3959b5909e7b5db4a216018c634a9d9898 (patch) | |
| tree | 9538abab1c0dbe1c43c595d03fb661af52f5ab2e /security/integrity/ima/ima_policy.c | |
| parent | ima: fix get_binary_runtime_size() (diff) | |
| download | kernel-qcow2-linux-bb543e3959b5909e7b5db4a216018c634a9d9898.tar.gz kernel-qcow2-linux-bb543e3959b5909e7b5db4a216018c634a9d9898.tar.xz kernel-qcow2-linux-bb543e3959b5909e7b5db4a216018c634a9d9898.zip | |
integrity: Small code improvements
These changes are too small to warrant their own patches:
The keyid and sig_size members of struct signature_v2_hdr are in BE format,
so use a type that makes this assumption explicit. Also, use beXX_to_cpu
instead of __beXX_to_cpu to read them.
Change integrity_kernel_read to take a void * buffer instead of char *
buffer, so that callers don't have to use a cast if they provide a buffer
that isn't a char *.
Add missing #endif comment in ima.h pointing out which macro it refers to.
Add missing fall through comment in ima_appraise.c.
Constify mask_tokens and func_tokens arrays.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_policy.c')
| -rw-r--r-- | security/integrity/ima/ima_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 0acd68decb17..949ad3858327 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -965,7 +965,7 @@ enum { mask_exec = 0, mask_write, mask_read, mask_append }; -static char *mask_tokens[] = { +static const char *const mask_tokens[] = { "MAY_EXEC", "MAY_WRITE", "MAY_READ", @@ -979,7 +979,7 @@ enum { func_policy }; -static char *func_tokens[] = { +static const char *const func_tokens[] = { "FILE_CHECK", "MMAP_CHECK", "BPRM_CHECK", |