switch mq_open() to umode_t (df0a4283) · Commits · 戴 / test

include/linux/audit.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -474,7 +474,7 @@ extern void audit_socketcall(int nargs, unsigned long *args);
		extern int audit_sockaddr(int len, void *addr);
		extern void __audit_fd_pair(int fd1, int fd2);
		extern int audit_set_macxattr(const char *name);
		extern void __audit_mq_open(int oflag, mode_t mode, struct mq_attr *attr);
		extern void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr);
		extern void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec *abs_timeout);
		extern void __audit_mq_notify(mqd_t mqdes, const struct sigevent *notification);
		extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);
		@@ -499,7 +499,7 @@ static inline void audit_ipc_set_perm(unsigned long qbytes, uid_t uid, gid_t gid
		if (unlikely(!audit_dummy_context()))
		__audit_ipc_set_perm(qbytes, uid, gid, mode);
		}
		static inline void audit_mq_open(int oflag, mode_t mode, struct mq_attr *attr)
		static inline void audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
		{
		if (unlikely(!audit_dummy_context()))
		__audit_mq_open(oflag, mode, attr);

+1 −1

Original line number	Diff line number	Diff line
		@@ -679,7 +679,7 @@ asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
		asmlinkage long sys_ipc(unsigned int call, int first, unsigned long second,
		unsigned long third, void __user *ptr, long fifth);

		asmlinkage long sys_mq_open(const char __user name, int oflag, mode_t mode, struct mq_attr __user attr);
		asmlinkage long sys_mq_open(const char __user name, int oflag, umode_t mode, struct mq_attr __user attr);
		asmlinkage long sys_mq_unlink(const char __user *name);
		asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec __user abs_timeout);
		asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user msg_ptr, size_t msg_len, unsigned int __user msg_prio, const struct timespec __user *abs_timeout);

+1 −1

Original line number	Diff line number	Diff line
		@@ -679,7 +679,7 @@ err:
		return ERR_PTR(ret);
		}

		SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, mode_t, mode,
		SYSCALL_DEFINE4(mq_open, const char __user *, u_name, int, oflag, umode_t, mode,
		struct mq_attr __user *, u_attr)
		{
		struct dentry *dentry;

+3 −3

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ struct audit_context {
		} mq_sendrecv;
		struct {
		int oflag;
		mode_t mode;
		umode_t mode;
		struct mq_attr attr;
		} mq_open;
		struct {
		@@ -1278,7 +1278,7 @@ static void show_special(struct audit_context context, int call_panic)
		break; }
		case AUDIT_MQ_OPEN: {
		audit_log_format(ab,
		"oflag=0x%x mode=%#o mq_flags=0x%lx mq_maxmsg=%ld "
		"oflag=0x%x mode=%#ho mq_flags=0x%lx mq_maxmsg=%ld "
		"mq_msgsize=%ld mq_curmsgs=%ld",
		context->mq_open.oflag, context->mq_open.mode,
		context->mq_open.attr.mq_flags,
		@@ -2160,7 +2160,7 @@ int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
		* @attr: queue attributes
		*
		*/
		void __audit_mq_open(int oflag, mode_t mode, struct mq_attr *attr)
		void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr)
		{
		struct audit_context *context = current->audit_context;