Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

switch kern_ipc_perm to umode_t

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 2570ebbd 0583fcc9

+8 -8
+2 -2
include/linux/audit.h
··· 468 468 #define audit_get_sessionid(t) ((t)->sessionid) 469 469 extern void audit_log_task_context(struct audit_buffer *ab); 470 470 extern void __audit_ipc_obj(struct kern_ipc_perm *ipcp); 471 - extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode); 471 + extern void __audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode); 472 472 extern int audit_bprm(struct linux_binprm *bprm); 473 473 extern void audit_socketcall(int nargs, unsigned long *args); 474 474 extern int audit_sockaddr(int len, void *addr); ··· 494 494 if (unlikely(!audit_dummy_context())) 495 495 __audit_fd_pair(fd1, fd2); 496 496 } 497 - static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, mode_t mode) 497 + static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid, umode_t mode) 498 498 { 499 499 if (unlikely(!audit_dummy_context())) 500 500 __audit_ipc_set_perm(qbytes, uid, gid, mode);
+1 -1
include/linux/ipc.h
··· 93 93 gid_t gid; 94 94 uid_t cuid; 95 95 gid_t cgid; 96 - mode_t mode; 96 + umode_t mode; 97 97 unsigned long seq; 98 98 void *security; 99 99 };
+5 -5
kernel/auditsc.c
··· 210 210 struct { 211 211 uid_t uid; 212 212 gid_t gid; 213 - mode_t mode; 213 + umode_t mode; 214 214 u32 osid; 215 215 int has_perm; 216 216 uid_t perm_uid; 217 217 gid_t perm_gid; 218 - mode_t perm_mode; 218 + umode_t perm_mode; 219 219 unsigned long qbytes; 220 220 } ipc; 221 221 struct { ··· 1249 1249 case AUDIT_IPC: { 1250 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 1253 context->ipc.uid, context->ipc.gid, context->ipc.mode); 1254 1254 if (osid) { 1255 1255 char *ctx = NULL; ··· 1267 1267 ab = audit_log_start(context, GFP_KERNEL, 1268 1268 AUDIT_IPC_SET_PERM); 1269 1269 audit_log_format(ab, 1270 - "qbytes=%lx ouid=%u ogid=%u mode=%#o", 1270 + "qbytes=%lx ouid=%u ogid=%u mode=%#ho", 1271 1271 context->ipc.qbytes, 1272 1272 context->ipc.perm_uid, 1273 1273 context->ipc.perm_gid, ··· 2260 2260 * 2261 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 2265 struct audit_context *context = current->audit_context; 2266 2266