From 386216d4a158d8bafb0879a0a753da096a939b93 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Sun, 7 Apr 2024 15:17:22 +1200
Subject: [PATCH] s3:mod:vfs_vxfs: use NUMERIC_CMP in vxfs_ace_cmp

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---
 source3/modules/vfs_vxfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source3/modules/vfs_vxfs.c b/source3/modules/vfs_vxfs.c
index aae2ca17337..ecc53d015f2 100644
--- a/source3/modules/vfs_vxfs.c
+++ b/source3/modules/vfs_vxfs.c
@@ -111,13 +111,13 @@ static int vxfs_ace_cmp(const void *ace1, const void *ace2)
 	type_a1 = SVAL(ace1, 0);
 	type_a2 = SVAL(ace2, 0);
 
-	ret = (type_a1 - type_a2);
-	if (!ret) {
+	ret = NUMERIC_CMP(type_a1, type_a2);
+	if (ret == 0) {
 		/* Compare ID under type */
 		/* skip perm thus take offset as 4*/
 		id_a1 = IVAL(ace1, 4);
 		id_a2 = IVAL(ace2, 4);
-		ret = id_a1 - id_a2;
+		ret = NUMERIC_CMP(id_a1, id_a2);
 	}
 
 	return ret;