aboutsummaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_main.c
diff options
context:
space:
mode:
authorDmitry Kasatkin <d.kasatkin@samsung.com>2013-10-10 02:56:13 -0400
committerMimi Zohar <zohar@linux.vnet.ibm.com>2013-10-25 13:17:19 -0400
commit089bc8e95ae07b1ada14069935c30fd88204c21c (patch)
treefa5b0004498ddc7bbe023f6da638b5c713b75334 /security/integrity/ima/ima_main.c
parent4ef4c943a0eabd2e0cd37d07c3a6b1da8e73efdf (diff)
ima: fix script messages
Fix checkpatch, lindent, etc, warnings/errors Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_main.c')
-rw-r--r--security/integrity/ima/ima_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index e9508d5bbfcf..0f359df6344c 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -244,9 +244,9 @@ int ima_file_mmap(struct file *file, unsigned long prot)
244int ima_bprm_check(struct linux_binprm *bprm) 244int ima_bprm_check(struct linux_binprm *bprm)
245{ 245{
246 return process_measurement(bprm->file, 246 return process_measurement(bprm->file,
247 (strcmp(bprm->filename, bprm->interp) == 0) ? 247 (strcmp(bprm->filename, bprm->interp) == 0) ?
248 bprm->filename : bprm->interp, 248 bprm->filename : bprm->interp,
249 MAY_EXEC, BPRM_CHECK); 249 MAY_EXEC, BPRM_CHECK);
250} 250}
251 251
252/** 252/**
@@ -263,8 +263,8 @@ int ima_file_check(struct file *file, int mask)
263{ 263{
264 ima_rdwr_violation_check(file); 264 ima_rdwr_violation_check(file);
265 return process_measurement(file, NULL, 265 return process_measurement(file, NULL,
266 mask & (MAY_READ | MAY_WRITE | MAY_EXEC), 266 mask & (MAY_READ | MAY_WRITE | MAY_EXEC),
267 FILE_CHECK); 267 FILE_CHECK);
268} 268}
269EXPORT_SYMBOL_GPL(ima_file_check); 269EXPORT_SYMBOL_GPL(ima_file_check);
270 270