[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <ab5708c1e35e1b2a54a1d83fafda1b3f8fa01103.1748218528.git.collin.funk1@gmail.com>
Date: Sun, 25 May 2025 17:17:46 -0700
From: Collin Funk <collin.funk1@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Collin Funk <collin.funk1@...il.com>
Subject: [PATCH] groups: Use bsearch instead of hand rolled implementation
This code predates <linux/bsearch.h>. Now that the bsearch function
exists there we can use it to reduce code duplication.
Signed-off-by: Collin Funk <collin.funk1@...il.com>
---
kernel/groups.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/kernel/groups.c b/kernel/groups.c
index 9b43da22647d..4294a97e4ea8 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -2,6 +2,7 @@
/*
* Supplementary group IDs
*/
+#include <linux/bsearch.h>
#include <linux/cred.h>
#include <linux/export.h>
#include <linux/slab.h>
@@ -91,23 +92,13 @@ EXPORT_SYMBOL(groups_sort);
/* a simple bsearch */
int groups_search(const struct group_info *group_info, kgid_t grp)
{
- unsigned int left, right;
+ void *result;
if (!group_info)
return 0;
-
- left = 0;
- right = group_info->ngroups;
- while (left < right) {
- unsigned int mid = (left+right)/2;
- if (gid_gt(grp, group_info->gid[mid]))
- left = mid + 1;
- else if (gid_lt(grp, group_info->gid[mid]))
- right = mid;
- else
- return 1;
- }
- return 0;
+ result = bsearch(&grp, group_info->gid, group_info->ngroups,
+ sizeof(*group_info->gid), gid_cmp);
+ return !!result;
}
/**
--
2.49.0
Powered by blists - more mailing lists