44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From b18fddef2e0aecb1cfba4cc3e495ea9ba09b49bd Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Fri, 5 Jan 2024 19:35:32 +0100
|
|
Subject: [PATCH] libselinux: reorder calloc(3) arguments
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The canonical order of calloc(3) parameters is the number of elements
|
|
first and the size of each element second.
|
|
|
|
Reported by GCC 14:
|
|
|
|
is_customizable_type.c:43:45: warning: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference:https://github.com/SELinuxProject/selinux/commit/b18fddef2e0aecb1cfba4cc3e495ea9ba09b49bd
|
|
Conflict:path adapt
|
|
|
|
---
|
|
src/is_customizable_type.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/src/is_customizable_type.c b/src/is_customizable_type.c
|
|
index da301c60..0ae92c8d 100644
|
|
--- a/src/is_customizable_type.c
|
|
+++ b/src/is_customizable_type.c
|
|
@@ -39,9 +39,7 @@ static int get_customizable_type_list(char *** retlist)
|
|
}
|
|
rewind(fp);
|
|
if (ctr) {
|
|
- list =
|
|
- (char **) calloc(sizeof(char *),
|
|
- ctr + 1);
|
|
+ list = calloc(ctr + 1, sizeof(char *));
|
|
if (list) {
|
|
i = 0;
|
|
while (fgets_unlocked(buf, selinux_page_size, fp)
|
|
--
|
|
2.33.0
|
|
|