userns: userns: Remove UIDGID_STRICT_TYPE_CHECKS
Removing UIDGID_STRICT_TYPE_CHECKS simplifies the code and always generates a compile error if the uids and kuids or gids and kgids are mixed by accident. Now that the appropriate conversions have been placed throughout the kernel there is no longer a need for a mode where we don't detect them as compile errors. Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
@@ -17,8 +17,6 @@
|
||||
struct user_namespace;
|
||||
extern struct user_namespace init_user_ns;
|
||||
|
||||
#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
|
||||
|
||||
typedef struct {
|
||||
uid_t val;
|
||||
} kuid_t;
|
||||
@@ -41,26 +39,6 @@ static inline gid_t __kgid_val(kgid_t gid)
|
||||
return gid.val;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
typedef uid_t kuid_t;
|
||||
typedef gid_t kgid_t;
|
||||
|
||||
static inline uid_t __kuid_val(kuid_t uid)
|
||||
{
|
||||
return uid;
|
||||
}
|
||||
|
||||
static inline gid_t __kgid_val(kgid_t gid)
|
||||
{
|
||||
return gid;
|
||||
}
|
||||
|
||||
#define KUIDT_INIT(value) ((kuid_t) value )
|
||||
#define KGIDT_INIT(value) ((kgid_t) value )
|
||||
|
||||
#endif
|
||||
|
||||
#define GLOBAL_ROOT_UID KUIDT_INIT(0)
|
||||
#define GLOBAL_ROOT_GID KGIDT_INIT(0)
|
||||
|
||||
|
Reference in New Issue
Block a user