Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f7e94ee authored by Paul Moore's avatar Paul Moore
Browse files

Merge branch 'next' into upstream for v3.19

parents 799b6014 0288d718

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1689,10 +1689,11 @@ S: Supported 
F:	drivers/scsi/esas2r



AUDIT SUBSYSTEM

M:	Paul Moore <paul@paul-moore.com>

M:	Eric Paris <eparis@redhat.com>

L:	linux-audit@redhat.com (subscribers-only)

L:	linux-audit@redhat.com (moderated for non-subscribers)

W:	http://people.redhat.com/sgrubb/audit/

T:	git git://git.infradead.org/users/eparis/audit.git

T:	git git://git.infradead.org/users/pcmoore/audit

S:	Maintained

F:	include/linux/audit.h

F:	include/uapi/linux/audit.h

include/uapi/linux/audit.h

+13 −4
Original line number Diff line number Diff line
@@ -322,9 +322,15 @@ enum { 
#define AUDIT_STATUS_BACKLOG_LIMIT	0x0010

#define AUDIT_STATUS_BACKLOG_WAIT_TIME	0x0020



#define AUDIT_VERSION_BACKLOG_LIMIT	1

#define AUDIT_VERSION_BACKLOG_WAIT_TIME	2

#define AUDIT_VERSION_LATEST AUDIT_VERSION_BACKLOG_WAIT_TIME

#define AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT	0x00000001

#define AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME	0x00000002

#define AUDIT_FEATURE_BITMAP_ALL (AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT | \

				  AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME)



/* deprecated: AUDIT_VERSION_* */

#define AUDIT_VERSION_LATEST 		AUDIT_FEATURE_BITMAP_ALL

#define AUDIT_VERSION_BACKLOG_LIMIT	AUDIT_FEATURE_BITMAP_BACKLOG_LIMIT

#define AUDIT_VERSION_BACKLOG_WAIT_TIME	AUDIT_FEATURE_BITMAP_BACKLOG_WAIT_TIME



				/* Failure-to-log actions */

#define AUDIT_FAIL_SILENT	0
@@ -403,7 +409,10 @@ struct audit_status { 
	__u32		backlog_limit;	/* waiting messages limit */

	__u32		lost;		/* messages lost */

	__u32		backlog;	/* messages waiting in queue */

	__u32		version;	/* audit api version number */

	union {

		__u32	version;	/* deprecated: audit api version num */

		__u32	feature_bitmap;	/* bitmap of kernel audit features */

	};

	__u32		backlog_wait_time;/* message queue wait timeout */

};

kernel/audit.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
		s.backlog_limit		= audit_backlog_limit;

		s.lost			= atomic_read(&audit_lost);

		s.backlog		= skb_queue_len(&audit_skb_queue);

		s.version		= AUDIT_VERSION_LATEST;

		s.feature_bitmap	= AUDIT_FEATURE_BITMAP_ALL;

		s.backlog_wait_time	= audit_backlog_wait_time;

		audit_send_reply(skb, seq, AUDIT_GET, 0, 0, &s, sizeof(s));

		break;