diff options
| author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
| commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
| tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /security/smack/smack_access.c | |
| parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
| parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/smack/smack_access.c')
| -rw-r--r-- | security/smack/smack_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index 79ff21ed4c3b..247cec3b5a43 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c | |||
| @@ -164,7 +164,7 @@ int smk_curacc(char *obj_label, u32 mode) | |||
| 164 | { | 164 | { |
| 165 | int rc; | 165 | int rc; |
| 166 | 166 | ||
| 167 | rc = smk_access(current->security, obj_label, mode); | 167 | rc = smk_access(current_security(), obj_label, mode); |
| 168 | if (rc == 0) | 168 | if (rc == 0) |
| 169 | return 0; | 169 | return 0; |
| 170 | 170 | ||
| @@ -173,7 +173,7 @@ int smk_curacc(char *obj_label, u32 mode) | |||
| 173 | * only one that gets privilege and current does not | 173 | * only one that gets privilege and current does not |
| 174 | * have that label. | 174 | * have that label. |
| 175 | */ | 175 | */ |
| 176 | if (smack_onlycap != NULL && smack_onlycap != current->security) | 176 | if (smack_onlycap != NULL && smack_onlycap != current->cred->security) |
| 177 | return rc; | 177 | return rc; |
| 178 | 178 | ||
| 179 | if (capable(CAP_MAC_OVERRIDE)) | 179 | if (capable(CAP_MAC_OVERRIDE)) |