Commit 7392906e authored by Al Viro's avatar Al Viro
Browse files

sanitize audit_mq_getsetattr() 



* get rid of allocations
* make it return void
* don't duplicate parts of audit_dummy_context()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent e816f370

include/linux/audit.h

+4 −5
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ extern int __audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr 
extern int __audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, const struct timespec __user *u_abs_timeout);

extern int __audit_mq_timedreceive(mqd_t mqdes, size_t msg_len, unsigned int __user *u_msg_prio, const struct timespec __user *u_abs_timeout);

extern int __audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification);

extern int __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);

extern void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat);

extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm,

				  const struct cred *new,

				  const struct cred *old);
@@ -500,11 +500,10 @@ static inline int audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_n 
		return __audit_mq_notify(mqdes, u_notification);

	return 0;

}

static inline int audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)

static inline void audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)

{

	if (unlikely(!audit_dummy_context()))

		return __audit_mq_getsetattr(mqdes, mqstat);

	return 0;

		__audit_mq_getsetattr(mqdes, mqstat);

}



static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
@@ -555,7 +554,7 @@ extern int audit_signals; 
#define audit_mq_timedsend(d,l,p,t) ({ 0; })

#define audit_mq_timedreceive(d,l,p,t) ({ 0; })

#define audit_mq_notify(d,n) ({ 0; })

#define audit_mq_getsetattr(d,s) ({ 0; })

#define audit_mq_getsetattr(d,s) ((void)0)

#define audit_log_bprm_fcaps(b, ncr, ocr) ({ 0; })

#define audit_log_capset(pid, ncr, ocr) ({ 0; })

#define audit_ptrace(t) ((void)0)

ipc/mqueue.c

+1 −5
Original line number Diff line number Diff line
@@ -1150,11 +1150,7 @@ asmlinkage long sys_mq_getsetattr(mqd_t mqdes, 
	omqstat = info->attr;

	omqstat.mq_flags = filp->f_flags & O_NONBLOCK;

	if (u_mqstat) {

		ret = audit_mq_getsetattr(mqdes, &mqstat);

		if (ret != 0) {

			spin_unlock(&info->lock);

			goto out_fput;

		}

		audit_mq_getsetattr(mqdes, &mqstat);

		if (mqstat.mq_flags & O_NONBLOCK)

			filp->f_flags |= O_NONBLOCK;

		else

kernel/auditsc.c

+17 −37
Original line number Diff line number Diff line
@@ -145,12 +145,6 @@ struct audit_aux_data_mq_notify { 
	struct sigevent 	notification;

};



struct audit_aux_data_mq_getsetattr {

	struct audit_aux_data	d;

	mqd_t			mqdes;

	struct mq_attr 		mqstat;

};



struct audit_aux_data_execve {

	struct audit_aux_data	d;

	int argc;
@@ -248,6 +242,10 @@ struct audit_context { 
			mode_t			perm_mode;

			unsigned long		qbytes;

		} ipc;

		struct {

			mqd_t			mqdes;

			struct mq_attr 		mqstat;

		} mq_getsetattr;

	};



#if AUDIT_DEBUG
@@ -1269,6 +1267,15 @@ static void show_special(struct audit_context *context, int *call_panic) 
				return;

		}

		break; }

	case AUDIT_MQ_GETSETATTR: {

		struct mq_attr *attr = &context->mq_getsetattr.mqstat;

		audit_log_format(ab,

			"mqdes=%d mq_flags=0x%lx mq_maxmsg=%ld mq_msgsize=%ld "

			"mq_curmsgs=%ld ",

			context->mq_getsetattr.mqdes,

			attr->mq_flags, attr->mq_maxmsg,

			attr->mq_msgsize, attr->mq_curmsgs);

		break; }

	}

	audit_log_end(ab);

}
@@ -1377,16 +1384,6 @@ static void audit_log_exit(struct audit_context *context, struct task_struct *ts 
				axi->notification.sigev_signo);

			break; }



		case AUDIT_MQ_GETSETATTR: {

			struct audit_aux_data_mq_getsetattr *axi = (void *)aux;

			audit_log_format(ab,

				"mqdes=%d mq_flags=0x%lx mq_maxmsg=%ld mq_msgsize=%ld "

				"mq_curmsgs=%ld ",

				axi->mqdes,

				axi->mqstat.mq_flags, axi->mqstat.mq_maxmsg,

				axi->mqstat.mq_msgsize, axi->mqstat.mq_curmsgs);

			break; }



		case AUDIT_EXECVE: {

			struct audit_aux_data_execve *axi = (void *)aux;

			audit_log_execve_info(context, &ab, axi);
@@ -2316,30 +2313,13 @@ int __audit_mq_notify(mqd_t mqdes, const struct sigevent __user *u_notification) 
 * @mqdes: MQ descriptor

 * @mqstat: MQ flags

 *

 * Returns 0 for success or NULL context or < 0 on error.

 */

int __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)

void __audit_mq_getsetattr(mqd_t mqdes, struct mq_attr *mqstat)

{

	struct audit_aux_data_mq_getsetattr *ax;

	struct audit_context *context = current->audit_context;



	if (!audit_enabled)

		return 0;



	if (likely(!context))

		return 0;



	ax = kmalloc(sizeof(*ax), GFP_ATOMIC);

	if (!ax)

		return -ENOMEM;



	ax->mqdes = mqdes;

	ax->mqstat = *mqstat;



	ax->d.type = AUDIT_MQ_GETSETATTR;

	ax->d.next = context->aux;

	context->aux = (void *)ax;

	return 0;

	context->mq_getsetattr.mqdes = mqdes;

	context->mq_getsetattr.mqstat = *mqstat;

	context->type = AUDIT_MQ_GETSETATTR;

}



/**