rpms/kernel/devel kernel-2.6.spec, 1.2200.2.1, 1.2200.2.2 linux-2.6-audit-pending.patch, 1.1.8.1, 1.1.8.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu May 11 19:02:46 UTC 2006
Author: sgrubb
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29538
Modified Files:
Tag: private-lspp-24-branch
kernel-2.6.spec linux-2.6-audit-pending.patch
Log Message:
lspp.25 build
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2200.2.1
retrieving revision 1.2200.2.2
diff -u -r1.2200.2.1 -r1.2200.2.2
--- kernel-2.6.spec 9 May 2006 20:37:28 -0000 1.2200.2.1
+++ kernel-2.6.spec 11 May 2006 19:01:29 -0000 1.2200.2.2
@@ -26,7 +26,7 @@
%define sublevel 16
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}
-%define rhbsys .lspp.24
+%define rhbsys .lspp.25
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys}
%define signmodules 0
%define xen_version 20060503
@@ -409,7 +409,6 @@
# Audit & lspp patches
Patch20100: linux-2.6-audit-pending.patch
-Patch20101: linux-2.6-audit-list-sync.patch
# END OF PATCH DEFINITIONS
@@ -1077,7 +1076,6 @@
# Audit patches
%patch20100 -p1
-%patch20101 -p1
# now run oldconfig over all the config files
for i in *.config
@@ -1724,6 +1722,9 @@
%endif
%changelog
+* Thu May 11 2006 Steve Grubb <sgrubb at redhat.com>
+- lspp.25
+
* Tue May 9 2006 Steve Grubb <sgrubb at redhat.com>
- lspp.24
linux-2.6-audit-pending.patch:
fs/Kconfig | 24 -
fs/Makefile | 1
fs/exec.c | 6
fs/inotify.c | 966 ++++++++++++-----------------------------------
fs/inotify_user.c | 709 ++++++++++++++++++++++++++++++++++
include/linux/audit.h | 11
include/linux/fsnotify.h | 29 -
include/linux/inotify.h | 85 +++-
include/linux/sched.h | 2
init/Kconfig | 3
kernel/audit.c | 118 ++++-
kernel/audit.h | 54 ++
kernel/auditfilter.c | 859 ++++++++++++++++++++++++++++++++++++++---
kernel/auditsc.c | 202 +++++++--
kernel/signal.c | 2
kernel/sysctl.c | 4
kernel/user.c | 2
17 files changed, 2183 insertions(+), 894 deletions(-)
Index: linux-2.6-audit-pending.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-audit-pending.patch,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -u -r1.1.8.1 -r1.1.8.2
--- linux-2.6-audit-pending.patch 9 May 2006 20:37:29 -0000 1.1.8.1
+++ linux-2.6-audit-pending.patch 11 May 2006 19:02:07 -0000 1.1.8.2
@@ -1290,10 +1290,10 @@
diff --git a/fs/inotify_user.c b/fs/inotify_user.c
new file mode 100644
-index 0000000..be00c4e
+index 0000000..1ed17ae
--- /dev/null
+++ b/fs/inotify_user.c
-@@ -0,0 +1,708 @@
+@@ -0,0 +1,709 @@
+/*
+ * fs/inotify.c - inode-based file event notifications
+ *
@@ -1568,14 +1568,14 @@
+ const char *lastname = last->name;
+
+ if (!name && !lastname)
-+ return;
++ goto out;
+ if (name && lastname && !strcmp(lastname, name))
-+ return;
++ goto out;
+ }
+
+ /* the queue overflowed and we already sent the Q_OVERFLOW event */
+ if (unlikely(dev->event_count > dev->max_events))
-+ return;
++ goto out;
+
+ /* if the queue overflows, we need to notify user space */
+ if (unlikely(dev->event_count == dev->max_events))
@@ -1584,7 +1584,7 @@
+ kevent = kernel_event(wd, mask, cookie, name);
+
+ if (unlikely(!kevent))
-+ return;
++ goto out;
+
+ /* queue the event and wake up anyone waiting */
+ dev->event_count++;
@@ -1592,6 +1592,7 @@
+ list_add_tail(&kevent->list, &dev->events);
+ wake_up_interruptible(&dev->wq);
+
++out:
+ mutex_unlock(&dev->ev_mutex);
+}
+
@@ -2343,7 +2344,7 @@
config IKCONFIG
bool "Kernel .config support"
diff --git a/kernel/audit.c b/kernel/audit.c
-index df57b49..2878dc7 100644
+index df57b49..a300b1e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -56,6 +56,7 @@
@@ -2424,7 +2425,7 @@
}
static int kauditd_thread(void *dummy)
-@@ -363,9 +369,48 @@ static int kauditd_thread(void *dummy)
+@@ -363,9 +369,52 @@ static int kauditd_thread(void *dummy)
remove_wait_queue(&kauditd_wait, &wait);
}
}
@@ -2436,6 +2437,10 @@
+ int pid = dest->pid;
+ struct sk_buff *skb;
+
++ /* wait for parent to finish and send an ACK */
++ mutex_lock(&audit_cmd_mutex);
++ mutex_unlock(&audit_cmd_mutex);
++
+ while ((skb = __skb_dequeue(&dest->q)) != NULL)
+ netlink_unicast(audit_sock, skb, pid, 0);
+
@@ -2473,7 +2478,7 @@
/**
* audit_send_reply - send an audit reply message via netlink
* @pid: process id to send reply to
-@@ -383,29 +428,13 @@ void audit_send_reply(int pid, int seq,
+@@ -383,29 +432,13 @@ void audit_send_reply(int pid, int seq,
void *payload, int size)
{
struct sk_buff *skb;
@@ -2504,7 +2509,7 @@
}
/*
-@@ -523,10 +552,10 @@ static int audit_receive_msg(struct sk_b
+@@ -523,10 +556,10 @@ static int audit_receive_msg(struct sk_b
audit_pid = status_get->pid;
}
if (status_get->mask & AUDIT_STATUS_RATE_LIMIT)
@@ -2517,7 +2522,7 @@
loginuid, sid);
break;
case AUDIT_USER:
-@@ -586,6 +615,7 @@ static int audit_receive_msg(struct sk_b
+@@ -586,6 +619,7 @@ static int audit_receive_msg(struct sk_b
case AUDIT_SIGNAL_INFO:
sig_data.uid = audit_sig_uid;
sig_data.pid = audit_sig_pid;
@@ -2525,7 +2530,7 @@
audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_SIGNAL_INFO,
0, 0, &sig_data, sizeof(sig_data));
break;
-@@ -629,20 +659,22 @@ static void audit_receive(struct sock *s
+@@ -629,20 +663,22 @@ static void audit_receive(struct sock *s
struct sk_buff *skb;
unsigned int qlen;
@@ -2550,7 +2555,7 @@
printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
audit_default ? "enabled" : "disabled");
audit_sock = netlink_kernel_create(NETLINK_AUDIT, 0, audit_receive,
-@@ -661,6 +693,16 @@ static int __init audit_init(void)
+@@ -661,6 +697,16 @@ static int __init audit_init(void)
selinux_audit_set_callback(&selinux_audit_rule_update);
audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized");
@@ -2567,7 +2572,7 @@
return 0;
}
__initcall(audit_init);
-@@ -690,10 +732,12 @@ static void audit_buffer_free(struct aud
+@@ -690,10 +736,12 @@ static void audit_buffer_free(struct aud
kfree_skb(ab->skb);
spin_lock_irqsave(&audit_freelist_lock, flags);
@@ -2582,7 +2587,7 @@
spin_unlock_irqrestore(&audit_freelist_lock, flags);
}
-@@ -998,18 +1042,20 @@ void audit_log_hex(struct audit_buffer *
+@@ -998,18 +1046,20 @@ void audit_log_hex(struct audit_buffer *
* or a space. Unescaped strings will start and end with a double quote mark.
* Strings that are escaped are printed in hex (2 digits per char).
*/
More information about the fedora-cvs-commits
mailing list