SOURCES (LINUX_2_6): linux-2.6-grsec-minimal.patch - dead code rem...

[baggins]

Author: baggins                      Date: Wed Oct 11 13:59:17 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- dead code removal

---- Files affected:
SOURCES:
   linux-2.6-grsec-minimal.patch (1.1.2.15 -> 1.1.2.16) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec-minimal.patch
diff -u SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.15 SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.16
--- SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.15	Wed Oct 11 15:42:22 2006
+++ SOURCES/linux-2.6-grsec-minimal.patch	Wed Oct 11 15:59:12 2006
@@ -206,15 +206,15 @@
  	int ret = 0;
  
 -	if (task) {
-+	if (task &&
++	if (task
 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+	    (!tmp->uid || (tmp->uid == task->uid)
++	    && (!tmp->uid || (tmp->uid == task->uid)
 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
 +	    || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
 +#endif
-+	    ) &&
++	    )
 +#endif
-+	    !gr_check_hidden_task(task)) {
++	    ) {
  		ret = 1;
  		/* discard wrong fakeinit */
  		if (!vx_check(vx_task_xid(task), VX_IDENT))
@@ -643,69 +643,11 @@
 diff -urN linux-2.6.16.2/grsecurity/grsec_disabled.c linux-2.6.16.2-grsec/grsecurity/grsec_disabled.c
 --- linux-2.6.16.2/grsecurity/grsec_disabled.c	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16.2-grsec/grsecurity/grsec_disabled.c	2006-04-11 17:44:40.113709750 +0200
-@@ -0,0 +1,63 @@
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/config.h>
-+#include <linux/sched.h>
-+#include <linux/file.h>
-+#include <linux/fs.h>
-+#include <linux/kdev_t.h>
-+#include <linux/net.h>
-+#include <linux/in.h>
-+#include <linux/ip.h>
-+#include <linux/skbuff.h>
-+#include <linux/sysctl.h>
-+
-+#ifdef CONFIG_SYSCTL
-+__u32
-+gr_handle_sysctl(const struct ctl_table * table, __u32 mode)
-+{
-+	return mode;
-+}
-+#endif
-+
+@@ -0,0 +1,5 @@
 +void
 +grsecurity_init(void)
 +{
 +	return;
-+}
-+
-+__u32
-+gr_acl_handle_symlink(const struct dentry * new_dentry,
-+		      const struct dentry * parent_dentry,
-+		      const struct vfsmount * parent_mnt, const char *from)
-+{
-+	return 1;
-+}
-+
-+__u32
-+gr_acl_handle_link(const struct dentry * new_dentry,
-+		   const struct dentry * parent_dentry,
-+		   const struct vfsmount * parent_mnt,
-+		   const struct dentry * old_dentry,
-+		   const struct vfsmount * old_mnt, const char *to)
-+{
-+	return 1;
-+}
-+
-+int
-+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
-+		const time_t shm_createtime, const uid_t cuid, const int shmid)
-+{
-+	return 1;
-+}
-+
-+int
-+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
-+{
-+	return 1;
-+}
-+
-+int
-+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
-+{
-+	return 1;
 +}
 diff -urN linux-2.6.16.2/grsecurity/grsec_fifo.c linux-2.6.16.2-grsec/grsecurity/grsec_fifo.c
 --- linux-2.6.16.2/grsecurity/grsec_fifo.c	1970-01-01 01:00:00.000000000 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-grsec-minimal.patch?r1=1.1.2.15&r2=1.1.2.16&f=u