diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-01-26 17:02:41 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-02-07 03:06:23 -0500 |
commit | 1e93d0052d9a6b3d0b382eedceb18b519d603baf (patch) | |
tree | b47cb67cdfd98e257c4d7fb7ed75f6930a1bf005 /security/integrity/ima/ima_main.c | |
parent | 9bbb6cad0173e6220f3ac609e26beb48dab3b7cd (diff) |
ima: rename PATH_CHECK to FILE_CHECK
With the movement of the ima hooks functions were renamed from *path* to
*file* since they always deal with struct file. This patch renames some of
the ima internal flags to make them consistent with the rest of the code.
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/integrity/ima/ima_main.c')
-rw-r--r-- | security/integrity/ima/ima_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index b76e1f03ea2b..294b005d6520 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c | |||
@@ -153,7 +153,7 @@ void ima_counts_get(struct file *file) | |||
153 | if (!iint) | 153 | if (!iint) |
154 | return; | 154 | return; |
155 | mutex_lock(&iint->mutex); | 155 | mutex_lock(&iint->mutex); |
156 | rc = ima_must_measure(iint, inode, MAY_READ, PATH_CHECK); | 156 | rc = ima_must_measure(iint, inode, MAY_READ, FILE_CHECK); |
157 | if (rc < 0) | 157 | if (rc < 0) |
158 | goto out; | 158 | goto out; |
159 | 159 | ||
@@ -312,7 +312,7 @@ int ima_file_check(struct file *file, int mask) | |||
312 | 312 | ||
313 | rc = process_measurement(file, file->f_dentry->d_name.name, | 313 | rc = process_measurement(file, file->f_dentry->d_name.name, |
314 | mask & (MAY_READ | MAY_WRITE | MAY_EXEC), | 314 | mask & (MAY_READ | MAY_WRITE | MAY_EXEC), |
315 | PATH_CHECK); | 315 | FILE_CHECK); |
316 | return 0; | 316 | return 0; |
317 | } | 317 | } |
318 | EXPORT_SYMBOL_GPL(ima_file_check); | 318 | EXPORT_SYMBOL_GPL(ima_file_check); |