[CRIU] [PATCH] security: rename check_ids to check_uids and drop crid argument, v2

[Ruslan Kuprieiev]

Currently check_ids is used to check uids only. So lets rename it
and drop crid argument, as we can use cr_uid directly.

Signed-off-by: Ruslan Kuprieiev <kupruser at gmail.com>
---
 security.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/security.c b/security.c
index 253f674..1333b3c 100644
--- a/security.c
+++ b/security.c
@@ -57,14 +57,14 @@ int restrict_uid(unsigned int uid, unsigned int gid)
 	return 0;
 }
 
-static bool check_ids(unsigned int crid, unsigned int rid, unsigned int eid, unsigned int sid)
+static bool check_uids(unsigned int rid, unsigned int eid, unsigned int sid)
 {
-	if (crid == 0)
+	if (cr_uid == 0)
 		return true;
-	if (crid == rid && crid == eid && crid == sid)
+	if (cr_uid == rid && cr_uid == eid && cr_uid == sid)
 		return true;
 
-	pr_err("UID/GID mismatch %u != (%u,%u,%u)\n", crid, rid, eid, sid);
+	pr_err("UID mismatch %u != (%u,%u,%u)\n", cr_uid, rid, eid, sid);
 	return false;
 }
 
@@ -146,14 +146,14 @@ static bool check_caps(u32 *inh, u32 *eff, u32 *prm)
 
 bool may_dump(struct proc_status_creds *creds)
 {
-	return check_ids(cr_uid, creds->uids[0], creds->uids[1], creds->uids[2]) &&
+	return check_uids(creds->uids[0], creds->uids[1], creds->uids[2]) &&
 		check_gids(creds->gids[0], creds->gids[1], creds->gids[2]) &&
 		check_caps(creds->cap_inh, creds->cap_eff, creds->cap_prm);
 }
 
 bool may_restore(CredsEntry *creds)
 {
-	return check_ids(cr_uid, creds->uid, creds->euid, creds->suid) &&
+	return check_uids(creds->uid, creds->euid, creds->suid) &&
 		check_gids(creds->gid, creds->egid, creds->sgid) &&
 		check_groups(creds->groups, creds->n_groups) &&
 		check_caps(creds->cap_inh, creds->cap_eff, creds->cap_prm);
-- 
1.8.3.2