rpms/kernel/FC-5 kernel-2.6.spec, 1.2074, 1.2075 linux-2.6-audit-new-msg-types.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1769

Modified Files:
	kernel-2.6.spec linux-2.6-audit-new-msg-types.patch 
Log Message:
- Updated new audit msg types.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2074
retrieving revision 1.2075
diff -u -r1.2074 -r1.2075
--- kernel-2.6.spec	24 Mar 2006 23:51:59 -0000	1.2074
+++ kernel-2.6.spec	27 Mar 2006 16:36:39 -0000	1.2075
@@ -1669,6 +1669,9 @@
 %endif
 
 %changelog
+* Mon Mar 25 2006 Dave Jones <davej at redhat.com>
+- Updated new audit msg types.
+
 * Fri Mar 24 2006 Dave Jones <davej at redhat.com>
 - Reenable HDLC driver (#186257)
 - Reenable ISA NE2000 clones. (#136569)

linux-2.6-audit-new-msg-types.patch:
 include/linux/audit.h       |   22 ++++++++++++++++++----
 kernel/audit.c              |    2 ++
 security/selinux/nlmsgtab.c |    9 +++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

Index: linux-2.6-audit-new-msg-types.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-audit-new-msg-types.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-audit-new-msg-types.patch	27 Jan 2006 18:51:43 -0000	1.1
+++ linux-2.6-audit-new-msg-types.patch	27 Mar 2006 16:36:40 -0000	1.2
@@ -1,5 +1,6 @@
---- a/include/linux/audit.h
-+++ b/include/linux/audit.h
+diff -urp linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h
+--- linux-2.6.15.x86_64.orig/include/linux/audit.h	2006-03-22 08:27:53.000000000 -0500
++++ linux-2.6.15.x86_64/include/linux/audit.h	2006-03-22 08:26:56.000000000 -0500
 @@ -33,11 +33,20 @@
   * 1200 - 1299 messages internal to the audit daemon
   * 1300 - 1399 audit event messages
@@ -25,7 +26,14 @@
   */
  #define AUDIT_GET		1000	/* Get status */
  #define AUDIT_SET		1001	/* Set status (enable/disable/auditd) */
-@@ -54,6 +63,8 @@
+@@ -50,10 +59,15 @@
+ #define AUDIT_WATCH_REM		1008	/* Remove file/dir watch entry */
+ #define AUDIT_WATCH_LIST	1009	/* List all file/dir watches */
+ #define AUDIT_SIGNAL_INFO	1010	/* Get info about sender of signal to auditd */
++#define AUDIT_ADD_RULE		1011    /* Add syscall filtering rule */
++#define AUDIT_DEL_RULE		1012    /* Delete syscall filtering rule */
++#define AUDIT_LIST_RULES	1013    /* List syscall filtering rules */
+ 
  #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
  #define AUDIT_USER_AVC		1107	/* We filter this differently */
  #define AUDIT_LAST_USER_MSG	1199
@@ -34,9 +42,10 @@
   
  #define AUDIT_DAEMON_START      1200    /* Daemon startup record */
  #define AUDIT_DAEMON_END        1201    /* Daemon normal stop record */
---- a/kernel/audit.c
-+++ b/kernel/audit.c
-@@ -367,6 +367,7 @@ static int audit_netlink_ok(kernel_cap_t
+diff -urp linux-2.6.15.x86_64.orig/kernel/audit.c linux-2.6.15.x86_64/kernel/audit.c
+--- linux-2.6.15.x86_64.orig/kernel/audit.c	2006-03-22 08:28:05.000000000 -0500
++++ linux-2.6.15.x86_64/kernel/audit.c	2006-03-22 08:20:04.000000000 -0500
+@@ -351,6 +351,7 @@ static int audit_netlink_ok(kernel_cap_t
  		break;
  	case AUDIT_USER:
  	case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG:
@@ -44,7 +53,7 @@
  		if (!cap_raised(eff_cap, CAP_AUDIT_WRITE))
  			err = -EPERM;
  		break;
-@@ -447,6 +448,7 @@ static int audit_receive_msg(struct sk_b
+@@ -430,6 +431,7 @@ static int audit_receive_msg(struct sk_b
  		break;
  	case AUDIT_USER:
  	case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG:
@@ -52,9 +61,20 @@
  		if (!audit_enabled && msg_type != AUDIT_USER_AVC)
  			return 0;
  
---- a/security/selinux/nlmsgtab.c
-+++ b/security/selinux/nlmsgtab.c
-@@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16
+diff -urp linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c linux-2.6.15.x86_64/security/selinux/nlmsgtab.c
+--- linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c	2006-03-22 08:28:08.000000000 -0500
++++ linux-2.6.15.x86_64/security/selinux/nlmsgtab.c	2006-03-22 08:23:38.000000000 -0500
+@@ -104,6 +104,9 @@ static struct nlmsg_perm nlmsg_audit_per
+ 	{ AUDIT_WATCH_INS,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+ 	{ AUDIT_WATCH_REM,	NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
+ 	{ AUDIT_WATCH_LIST,	NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
++	{ AUDIT_ADD_RULE,       NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
++	{ AUDIT_DEL_RULE,       NETLINK_AUDIT_SOCKET__NLMSG_WRITE    },
++	{ AUDIT_LIST_RULES,     NETLINK_AUDIT_SOCKET__NLMSG_READPRIV },
+ };
+ 
+ 
+@@ -148,8 +151,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16
  		break;
  
  	case SECCLASS_NETLINK_AUDIT_SOCKET:
@@ -67,3 +87,4 @@
  			*perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY;
  		} else {
  			err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms,
+