The patch titled
Update CAP_LAST_CAP to reflect CAP_MAC_ADMIN
has been removed from the -mm tree. Its filename was
smack-using-capabilities-32-and-33-update-cap_last_cap-to-reflect-cap_mac_admin.patch
This patch was dropped because it was folded into smack-version-11c-simplified-mandatory-access-control-kernel.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Update CAP_LAST_CAP to reflect CAP_MAC_ADMIN
From: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Bump the value of CAP_LAST_CAP to reflect the current last cap value.
It appears that the patch that introduced CAP_LAST_CAP and the patch
that introduced CAP_MAC_ADMIN came in more or less at the same time.
Signed-off-by: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Signed-off-by: Serge Hallyn <serue@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/capability.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN include/linux/capability.h~smack-using-capabilities-32-and-33-update-cap_last_cap-to-reflect-cap_mac_admin include/linux/capability.h
--- a/include/linux/capability.h~smack-using-capabilities-32-and-33-update-cap_last_cap-to-reflect-cap_mac_admin
+++ a/include/linux/capability.h
@@ -315,10 +315,6 @@ typedef struct kernel_cap_struct {
#define CAP_SETFCAP 31
-#define CAP_LAST_CAP CAP_SETFCAP
-
-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
-
/* Override MAC access.
The base kernel enforces no MAC policy.
An LSM may enforce a MAC policy, and if it does and it chooses
@@ -336,6 +332,10 @@ typedef struct kernel_cap_struct {
#define CAP_MAC_ADMIN 33
+#define CAP_LAST_CAP CAP_MAC_ADMIN
+
+#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
+
/*
* Bit location of each capability (used by user-space library and kernel)
*/
_
Patches currently in -mm which might be from casey@xxxxxxxxxxxxxxxx are
vfs-security-rework-inode_getsecurity-and-callers-to.patch
vfs-reorder-vfs_getxattr-to-avoid-unnecessary-calls-to-the-lsm.patch
revert-capabilities-clean-up-file-capability-reading.patch
add-64-bit-capability-support-to-the-kernel.patch
capabilities-introduce-per-process-capability-bounding-set.patch
netlabel-introduce-a-new-kernel-configuration-api-for-netlabel.patch
smack-version-11c-simplified-mandatory-access-control-kernel.patch
smack-using-capabilities-32-and-33-update-cap_last_cap-to-reflect-cap_mac_admin.patch
smack-mutex-capability-pointers-and-spelling-cleanup.patch
smack-getpeercred_stream-fix-for-so_peersec-and-tcp.patch
smack-socket-label-setting-fix.patch
embed-a-struct-path-into-struct-nameidata-instead-of-nd-dentrymnt-smack-fix.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
