Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f2ea9f authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

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 avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7bf570dc

include/linux/capability.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -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 */