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

Commit e42852bf authored by Yaowei Bai's avatar Yaowei Bai Committed by James Morris
Browse files

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: default avatarYaowei Bai <baiyaowei@cmss.chinamobile.com>
Acked-by: default avatarSerge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent f70be6da

include/linux/capability.h

+8 −8
Original line number Diff line number Diff line
@@ -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);