SOURCES (LINUX_2_6): linux-2.6-grsec-caps.patch, linux-2.6-grsec-common.pat...

[zbyniu]

Author: zbyniu                       Date: Mon May 19 10:13:07 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for 2.6.25.4

---- Files affected:
SOURCES:
   linux-2.6-grsec-caps.patch (1.1.2.1.4.1 -> 1.1.2.1.4.2) , linux-2.6-grsec-common.patch (1.1.2.2.2.6 -> 1.1.2.2.2.7) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec-caps.patch
diff -u SOURCES/linux-2.6-grsec-caps.patch:1.1.2.1.4.1 SOURCES/linux-2.6-grsec-caps.patch:1.1.2.1.4.2
--- SOURCES/linux-2.6-grsec-caps.patch:1.1.2.1.4.1	Fri Aug 10 20:41:29 2007
+++ SOURCES/linux-2.6-grsec-caps.patch	Mon May 19 12:13:01 2008
@@ -1,11 +1,11 @@
---- linux-2.6.22/grsecurity/gracl_cap.c~	2007-08-09 22:52:32.000000000 +0200
-+++ linux-2.6.22/grsecurity/gracl_cap.c	2007-08-09 23:04:23.465906250 +0200
-@@ -37,7 +37,8 @@ static const char *captab_log[] = {
- 	"CAP_MKNOD",
- 	"CAP_LEASE",
- 	"CAP_AUDIT_WRITE",
--	"CAP_AUDIT_CONTROL"
-+	"CAP_AUDIT_CONTROL",
+--- e/grsecurity/gracl_cap.c~	2008-05-18 23:53:55.000000000 +0200
++++ e/grsecurity/gracl_cap.c	2008-05-18 23:55:05.591733291 +0200
+@@ -39,7 +39,8 @@ static const char *captab_log[] = {
+ 	"CAP_AUDIT_CONTROL",
+ 	"CAP_SETFCAP",
+ 	"CAP_MAC_OVERRIDE",
+-	"CAP_MAC_ADMIN"
++	"CAP_MAC_ADMIN",
 +	"CAP_CONTEXT"
  };
  

================================================================
Index: SOURCES/linux-2.6-grsec-common.patch
diff -u SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.6 SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.7
--- SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.6	Tue Mar 25 22:13:26 2008
+++ SOURCES/linux-2.6-grsec-common.patch	Mon May 19 12:13:02 2008
@@ -62,8 +62,8 @@
  
  int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
  {
--	cap_t(NETLINK_CB(skb).eff_cap) = gr_cap_rtnetlink(sk);
-+	cap_t(NETLINK_CB(skb).eff_cap) = gr_cap_rtnetlink(sk) & vx_mbcap(cap_effective);
+-	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
++	NETLINK_CB(skb).eff_cap = cap_intersect(gr_cap_rtnetlink(sk), vx_mbcaps(current->cap_effective));
  	return 0;
  }
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec-caps.patch?r1=1.1.2.1.4.1&r2=1.1.2.1.4.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec-common.patch?r1=1.1.2.2.2.6&r2=1.1.2.2.2.7&f=u