[kernel] r15251 - in dists/etch-security/linux-2.6.24/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Sat Feb 20 20:05:00 2010
New Revision: 15251

Log:
Fix a patch offset issue that resulted in a build failure when
CONFIG_SECURITY=n (this is only true for powerpc).

Added:
   dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/security-mmap-fix-patch-offset.patch
   dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch3
Modified:
   dists/etch-security/linux-2.6.24/debian/changelog

Modified: dists/etch-security/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch-security/linux-2.6.24/debian/changelog	Sat Feb 20 18:12:36 2010	(r15250)
+++ dists/etch-security/linux-2.6.24/debian/changelog	Sat Feb 20 20:05:00 2010	(r15251)
@@ -1,3 +1,10 @@
+linux-2.6.24 (2.6.24-6~etchnhalf.9etch3) UNRELEASED; urgency=high
+
+  * Fix a patch offset issue that resulted in a build failure when
+    CONFIG_SECURITY=n (this is only true for powerpc).
+
+ -- dann frazier <dannf at debian.org>  Fri, 19 Feb 2010 18:16:36 -0700
+
 linux-2.6.24 (2.6.24-6~etchnhalf.9etch2) oldstable-security; urgency=high
 
   * Avoid /proc/$pid/maps visibility during initial setuid ELF loading

Added: dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/security-mmap-fix-patch-offset.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/etch-security/linux-2.6.24/debian/patches/bugfix/all/security-mmap-fix-patch-offset.patch	Sat Feb 20 20:05:00 2010	(r15251)
@@ -0,0 +1,21 @@
+diff -urpN a/include/linux/security.h b/include/linux/security.h
+--- a/include/linux/security.h	2010-01-31 22:07:58.000000000 -0700
++++ b/include/linux/security.h	2010-02-19 18:11:19.000000000 -0700
+@@ -1994,7 +1994,7 @@ static inline int security_file_mmap (st
+ 				      unsigned long addr,
+ 				      unsigned long addr_only)
+ {
+-	return 0;
++	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
+ 
+ static inline int security_file_mprotect (struct vm_area_struct *vma,
+@@ -2160,7 +2160,7 @@ static inline void security_task_to_inod
+ static inline int security_ipc_permission (struct kern_ipc_perm *ipcp,
+ 					   short flag)
+ {
+-	return cap_file_mmap(file, reqprot, prot, flags, addr, addr_only);
++	return 0;
+ }
+ 
+ static inline int security_msg_msg_alloc (struct msg_msg * msg)

Added: dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch3
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/etch-security/linux-2.6.24/debian/patches/series/6~etchnhalf.9etch3	Sat Feb 20 20:05:00 2010	(r15251)
@@ -0,0 +1 @@
++ bugfix/all/security-mmap-fix-patch-offset.patch