2009-01-13 06:21:54

by Jaswinder Singh Rajput

Subject: [PATCH] capability.h: extern's make no sense in userspace

Impact: fix 2 make headers_check warnings:

usr/include/linux/capability.h:72: leaks CONFIG_SECURITY to userspace where it is not valid
usr/include/linux/capability.h:73: extern's make no sense in userspace

Signed-off-by: Jaswinder Singh Rajput <[email protected]>
---
include/linux/capability.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/capability.h b/include/linux/capability.h
index 02bdb76..1b98725 100644
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct {
#define VFS_CAP_U32 VFS_CAP_U32_2
#define VFS_CAP_REVISION VFS_CAP_REVISION_2

-#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
-extern int file_caps_enabled;
-#endif
-
struct vfs_cap_data {
__le32 magic_etc; /* Little endian */
struct {
@@ -96,6 +92,10 @@ struct vfs_cap_data {
#define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
#define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3

+#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
+extern int file_caps_enabled;
+#endif
+
typedef struct kernel_cap_struct {
__u32 cap[_KERNEL_CAPABILITY_U32S];
} kernel_cap_t;
--
1.5.6.6

2009-01-13 08:09:50

by Andrew G. Morgan

Subject: Re: [PATCH] capability.h: extern's make no sense in userspace

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Acked-by: Andrew G. Morgan <[email protected]>

Cheers

Andrew

Jaswinder Singh Rajput wrote:
> Impact: fix 2 make headers_check warnings:
>
> usr/include/linux/capability.h:72: leaks CONFIG_SECURITY to userspace where it is not valid
> usr/include/linux/capability.h:73: extern's make no sense in userspace
>
> Signed-off-by: Jaswinder Singh Rajput <[email protected]>
> ---
> include/linux/capability.h | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/capability.h b/include/linux/capability.h
> index 02bdb76..1b98725 100644
> --- a/include/linux/capability.h
> +++ b/include/linux/capability.h
> @@ -69,10 +69,6 @@ typedef struct __user_cap_data_struct {
> #define VFS_CAP_U32 VFS_CAP_U32_2
> #define VFS_CAP_REVISION VFS_CAP_REVISION_2
>
> -#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
> -extern int file_caps_enabled;
> -#endif
> -
> struct vfs_cap_data {
> __le32 magic_etc; /* Little endian */
> struct {
> @@ -96,6 +92,10 @@ struct vfs_cap_data {
> #define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
> #define _KERNEL_CAPABILITY_U32S _LINUX_CAPABILITY_U32S_3
>
> +#ifdef CONFIG_SECURITY_FILE_CAPABILITIES
> +extern int file_caps_enabled;
> +#endif
> +
> typedef struct kernel_cap_struct {
> __u32 cap[_KERNEL_CAPABILITY_U32S];
> } kernel_cap_t;
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJbEpT+bHCR3gb8jsRAnafAJ9CohxNIoKkQN5k+VEzFGGtIjdOsACcDQ3e
B/8spQ/5sSkyGQIN1kK0N9g=
=nkwT
-----END PGP SIGNATURE-----