diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-07-27 14:03:22 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:55:17 -0500 |
commit | 2570ebbd1f1ce1ef31f568b0660354fc59424be2 (patch) | |
tree | 79031afa99b298b8520dc85bffbb42ed7ebb6f59 /kernel/auditsc.c | |
parent | 0583fcc96bb117763c0fa74c123573c0112dec65 (diff) |
switch kern_ipc_perm to umode_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 9849213e501c..7a074d65fff4 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -210,12 +210,12 @@ struct audit_context { | |||
210 | struct { | 210 | struct { |
211 | uid_t uid; | 211 | uid_t uid; |
212 | gid_t gid; | 212 | gid_t gid; |
213 | mode_t mode; | 213 | umode_t mode; |
214 | u32 osid; | 214 | u32 osid; |
215 | int has_perm; | 215 | int has_perm; |
216 | uid_t perm_uid; | 216 | uid_t perm_uid; |
217 | gid_t perm_gid; | 217 | gid_t perm_gid; |
218 | mode_t perm_mode; | 218 | umode_t perm_mode; |
219 | unsigned long qbytes; | 219 | unsigned long qbytes; |
220 | } ipc; | 220 | } ipc; |
221 | struct { | 221 | struct { |
@@ -1249,7 +1249,7 @@ static void show_special(struct audit_context *context, int *call_panic) | |||
1249 | case AUDIT_IPC: { | 1249 | case AUDIT_IPC: { |
1250 | u32 osid = context->ipc.osid; | 1250 | u32 osid = context->ipc.osid; |
1251 | 1251 | ||
1252 | audit_log_format(ab, "ouid=%u ogid=%u mode=%#o", | 1252 | audit_log_format(ab, "ouid=%u ogid=%u mode=%#ho", |
1253 | context->ipc.uid, context->ipc.gid, context->ipc.mode); | 1253 | context->ipc.uid, context->ipc.gid, context->ipc.mode); |
1254 | if (osid) { | 1254 | if (osid) { |
1255 | char *ctx = NULL; | 1255 | char *ctx = NULL; |
@@ -1267,7 +1267,7 @@ static void show_special(struct audit_context *context, int *call_panic) | |||
1267 | ab = audit_log_start(context, GFP_KERNEL, | 1267 | ab = audit_log_start(context, GFP_KERNEL, |
1268 | AUDIT_IPC_SET_PERM); | 1268 | AUDIT_IPC_SET_PERM); |
1269 | audit_log_format(ab, | 1269 | audit_log_format(ab, |
1270 | "qbytes=%lx ouid=%u ogid=%u mode=%#o", | 1270 | "qbytes=%lx ouid=%u ogid=%u mode=%#ho", |
1271 | context->ipc.qbytes, | 1271 | context->ipc.qbytes, |
1272 | context->ipc.perm_uid, | 1272 | context->ipc.perm_uid, |
1273 | context->ipc.perm_gid, | 1273 | context->ipc.perm_gid, |
@@ -2260,7 +2260,7 @@ void __audit_ipc_obj(struct kern_ipc_perm *ipcp) | |||
2260 | * | 2260 | * |
2261 | * Called only after audit_ipc_obj(). | 2261 | * Called only after audit_ipc_obj(). |
2262 | */ | 2262 | */ |
2263 | void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode) | 2263 | void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode) |
2264 | { | 2264 | { |
2265 | struct audit_context *context = current->audit_context; | 2265 | struct audit_context *context = current->audit_context; |
2266 | 2266 | ||