The patch titled
file-caps clean up for linux/capability.h
has been removed from the -mm tree. Its filename was
file-caps-clean-up-for-linux-capabilityh.patch
This patch was dropped because it was folded into implement-file-posix-capabilities.patch
------------------------------------------------------
Subject: file-caps clean up for linux/capability.h
From: Andrew Morgan <morgan@xxxxxxxxxx>
These changes are needed to make compiling libcap work again.
You can download the corresponding (file-capability supporting) libcap
sources from here:
http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
Signed-off-by: Andrew Morgan <morgan@xxxxxxxxxx>
Cc: Serge E. Hallyn <serue@xxxxxxxxxx>
Cc: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: KaiGai Kohei <kaigai@xxxxxxxxxxxx>
Cc: Serge E. Hallyn <serue@xxxxxxxxxx>
Cc: Stephen Smalley <sds@xxxxxxxxxxxxx>
Cc: <chris@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/capability.h | 36 +++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff -puN include/linux/capability.h~file-caps-clean-up-for-linux-capabilityh include/linux/capability.h
--- a/include/linux/capability.h~file-caps-clean-up-for-linux-capabilityh
+++ a/include/linux/capability.h
@@ -1,14 +1,14 @@
/*
* This is <linux/capability.h>
*
- * Andrew G. Morgan <morgan@xxxxxxxxxxxxx>
+ * Andrew G. Morgan <morgan@xxxxxxxxxx>
* Alexander Kjeldaas <astor@xxxxxxxxxxx>
* with help from Aleph1, Roland Buresund and Andrew Main.
*
* See here for the libcap library ("POSIX draft" compliance):
*
- * ftp://linux.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.2/
- */
+ * ftp://linux.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+ */
#ifndef _LINUX_CAPABILITY_H
#define _LINUX_CAPABILITY_H
@@ -28,14 +28,14 @@ struct task_struct;
following structure to such a composite is better handled in a user
library since the draft standard requires the use of malloc/free
etc.. */
-
+
#define _LINUX_CAPABILITY_VERSION 0x19980330
typedef struct __user_cap_header_struct {
__u32 version;
int pid;
} __user *cap_user_header_t;
-
+
typedef struct __user_cap_data_struct {
__u32 effective;
__u32 permitted;
@@ -47,15 +47,13 @@ typedef struct __user_cap_data_struct {
#define XATTR_CAPS_SZ (3*sizeof(__le32))
#define VFS_CAP_REVISION_MASK 0xFF000000
-#define VFS_CAP_REVISION 0x01000000
+#define VFS_CAP_REVISION_1 0x01000000
+
+#define VFS_CAP_REVISION VFS_CAP_REVISION_1
#define VFS_CAP_FLAGS_MASK ~VFS_CAP_REVISION_MASK
#define VFS_CAP_FLAGS_EFFECTIVE 0x000001
-#ifdef __KERNEL__
-
-#include <asm/current.h>
-
struct vfs_cap_data {
__u32 magic_etc; /* Little endian */
struct {
@@ -64,6 +62,10 @@ struct vfs_cap_data {
} data[1];
};
+#ifdef __KERNEL__
+
+#include <asm/current.h>
+
/* #define STRICT_CAP_T_TYPECHECKS */
#ifdef STRICT_CAP_T_TYPECHECKS
@@ -77,7 +79,7 @@ typedef struct kernel_cap_struct {
typedef __u32 kernel_cap_t;
#endif
-
+
#define _USER_CAP_HEADER_SIZE (2*sizeof(__u32))
#define _KERNEL_CAP_T_SIZE (sizeof(kernel_cap_t))
@@ -85,7 +87,7 @@ typedef __u32 kernel_cap_t;
/**
- ** POSIX-draft defined capabilities.
+ ** POSIX-draft defined capabilities.
**/
/* In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, this
@@ -105,7 +107,7 @@ typedef __u32 kernel_cap_t;
defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE. */
#define CAP_DAC_READ_SEARCH 2
-
+
/* Overrides all restrictions about allowed operations on files, where
file owner ID must be equal to the user ID, except where CAP_FSETID
is applicable. It doesn't override MAC and DAC restrictions. */
@@ -275,7 +277,7 @@ typedef __u32 kernel_cap_t;
/* Override reserved space on ext2 filesystem */
/* Modify data journaling mode on ext3 filesystem (uses journaling
resources) */
-/* NOTE: ext2 honors fsuid when checking for resource overrides, so
+/* NOTE: ext2 honors fsuid when checking for resource overrides, so
you can override using fsuid too */
/* Override size restrictions on IPC message queues */
/* Allow more than 64hz interrupts from the real-time clock */
@@ -309,10 +311,8 @@ typedef __u32 kernel_cap_t;
#define CAP_SETFCAP 31
-#define CAP_NUMCAPS 32
-
#ifdef __KERNEL__
-/*
+/*
* Bounding set
*/
extern kernel_cap_t cap_bset;
@@ -320,7 +320,7 @@ extern kernel_cap_t cap_bset;
/*
* Internal kernel functions only
*/
-
+
#ifdef STRICT_CAP_T_TYPECHECKS
#define to_cap_t(x) { x }
_
Patches currently in -mm which might be from morgan@xxxxxxxxxx are
implement-file-posix-capabilities.patch
file-caps-clean-up-for-linux-capabilityh.patch
capabilityh-remove-include-of-currenth.patch
file-capabilities-clear-fcaps-on-inode-change.patch
capabilities-reset-current-pdeath_signal-when-increasing-capabilities.patch
sysctl-remove-binary-sysctl-support-where-it-clearly-doesnt-work.patch
v3-file-capabilities-alter-behavior-of-cap_setpcap.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
