diff options
| author | Yaowei Bai <baiyaowei@cmss.chinamobile.com> | 2015-11-17 15:25:24 +0800 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-11-18 11:20:40 +1100 |
| commit | e42852bf88144affc227884b62637118ba74b783 (patch) | |
| tree | 6d6e40e0ac42eb0440a1e783873337a3bf74d317 | |
| parent | f70be6dac6c39c939cef82e068b7e94aca96dc99 (diff) | |
security/capability.h: cap_issubset/isclear can be boolean
This patch makes cap_issubset/isclear return bool due to these
functions only using either one or zero as their return
value.
No functional change.
Signed-off-by: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
| -rw-r--r-- | include/linux/capability.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index b03200374608..f314275d4e3f 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h @@ -145,24 +145,24 @@ static inline kernel_cap_t cap_invert(const kernel_cap_t c) return dest; } -static inline int cap_isclear(const kernel_cap_t a) +static inline bool cap_isclear(const kernel_cap_t a) { unsigned __capi; CAP_FOR_EACH_U32(__capi) { if (a.cap[__capi] != 0) - return 0; + return false; } - return 1; + return true; } /* * Check if "a" is a subset of "set". - * return 1 if ALL of the capabilities in "a" are also in "set" - * cap_issubset(0101, 1111) will return 1 - * return 0 if ANY of the capabilities in "a" are not in "set" - * cap_issubset(1111, 0101) will return 0 + * return true if ALL of the capabilities in "a" are also in "set" + * cap_issubset(0101, 1111) will return true + * return false if ANY of the capabilities in "a" are not in "set" + * cap_issubset(1111, 0101) will return false */ -static inline int cap_issubset(const kernel_cap_t a, const kernel_cap_t set) +static inline bool cap_issubset(const kernel_cap_t a, const kernel_cap_t set) { kernel_cap_t dest; dest = cap_drop(a, set); |