diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 16:07:21 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-07 16:07:21 +0400 |
| commit | 638c87a91666df1f16866badee862ce38bf31e4a (patch) | |
| tree | 67be4d125ad6abe2eeee00eab12e0fc8f03fa099 /security/integrity/ima/ima_appraise.c | |
| parent | 7cb9cf0224efd6d41b2bdd9bfb412b42aa4281f8 (diff) | |
| parent | d26e1936227b538a1691b978566ef269aef10853 (diff) | |
| download | linux-638c87a91666df1f16866badee862ce38bf31e4a.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull IMA bugfix (security subsystem) from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
ima: fix bug in argument order
Diffstat (limited to 'security/integrity/ima/ima_appraise.c')
| -rw-r--r-- | security/integrity/ima/ima_appraise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 0aa43bde441c..bdc8ba1d1d27 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -34,7 +34,7 @@ __setup("ima_appraise=", default_appraise_setup); * * Return 1 to appraise */ -int ima_must_appraise(struct inode *inode, enum ima_hooks func, int mask) +int ima_must_appraise(struct inode *inode, int mask, enum ima_hooks func) { if (!ima_appraise) return 0; |