Commit 780db6c1 authored by David Howells's avatar David Howells Committed by James Morris

Security: Typecast CAP_*_SET macros

Cast the CAP_*_SET macros to be of kernel_cap_t type to avoid compiler
warnings.
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent e52c1764
...@@ -365,12 +365,12 @@ typedef struct kernel_cap_struct { ...@@ -365,12 +365,12 @@ typedef struct kernel_cap_struct {
# error Fix up hand-coded capability macro initializers # error Fix up hand-coded capability macro initializers
#else /* HAND-CODED capability initializers */ #else /* HAND-CODED capability initializers */
# define CAP_EMPTY_SET {{ 0, 0 }} # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }})
# define CAP_FULL_SET {{ ~0, ~0 }} # define CAP_FULL_SET ((kernel_cap_t){{ ~0, ~0 }})
# define CAP_INIT_EFF_SET {{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }} # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
# define CAP_FS_SET {{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } } # define CAP_FS_SET ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
# define CAP_NFSD_SET {{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \ # define CAP_NFSD_SET ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \
CAP_FS_MASK_B1 } } CAP_FS_MASK_B1 } })
#endif /* _LINUX_CAPABILITY_U32S != 2 */ #endif /* _LINUX_CAPABILITY_U32S != 2 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment