diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-22 11:21:06 +1000 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /security/capability.c | |
| parent | cffee16e8b997ab947de661e8820e486b0830c94 (diff) | |
| parent | c737f8284cac91428f8fcc8281e69117fa16e887 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/capability.c b/security/capability.c index 5bb21b1c448..fca889676c5 100644 --- a/security/capability.c +++ b/security/capability.c @@ -348,7 +348,7 @@ static int cap_file_receive(struct file *file) return 0; } -static int cap_dentry_open(struct file *file, const struct cred *cred) +static int cap_file_open(struct file *file, const struct cred *cred) { return 0; } @@ -956,7 +956,7 @@ void __init security_fixup_ops(struct security_operations *ops) set_to_cap_if_null(ops, file_set_fowner); set_to_cap_if_null(ops, file_send_sigiotask); set_to_cap_if_null(ops, file_receive); - set_to_cap_if_null(ops, dentry_open); + set_to_cap_if_null(ops, file_open); set_to_cap_if_null(ops, task_create); set_to_cap_if_null(ops, task_free); set_to_cap_if_null(ops, cred_alloc_blank); |