2007-11-29 00:27:15

by Casey Schaufler

Subject: [PATCH] (2.4.26-rc3-mm2) -mm Update CAP_LAST_CAP to reflect CAP_MAC_ADMIN

From: Casey Schaufler <[email protected]>

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 <[email protected]>

---

include/linux/capability.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)


diff -uprN -X linux-2.6.24-rc3-mm2-base/Documentation/dontdiff linux-2.6.24-rc3-mm2-base/include/linux/capability.h linux-2.6.24-rc3-mm2-lastcap/include/linux/capability.h
--- linux-2.6.24-rc3-mm2-base/include/linux/capability.h 2007-11-27 16:47:02.000000000 -0800
+++ linux-2.6.24-rc3-mm2-lastcap/include/linux/capability.h 2007-11-28 14:04:57.000000000 -0800
@@ -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)
*/

2007-11-29 02:50:52

by Serge E. Hallyn

Subject: Re: [PATCH] (2.4.26-rc3-mm2) -mm Update CAP_LAST_CAP to reflect CAP_MAC_ADMIN

Quoting Casey Schaufler ([email protected]):
> From: Casey Schaufler <[email protected]>
>
> 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 <[email protected]>

Signed-off-by: Serge Hallyn <[email protected]>


>
> ---
>
> include/linux/capability.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>
> diff -uprN -X linux-2.6.24-rc3-mm2-base/Documentation/dontdiff linux-2.6.24-rc3-mm2-base/include/linux/capability.h linux-2.6.24-rc3-mm2-lastcap/include/linux/capability.h
> --- linux-2.6.24-rc3-mm2-base/include/linux/capability.h 2007-11-27 16:47:02.000000000 -0800
> +++ linux-2.6.24-rc3-mm2-lastcap/include/linux/capability.h 2007-11-28 14:04:57.000000000 -0800
> @@ -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)
> */
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html