From bca6ebb65dfac92534756338952005d1ff98eafd Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 5 Oct 2010 13:06:19 +1030 Subject: [PATCH] idtree: fix right shift of signed ints, crash on large ids on AIX Right-shifting signed integers in undefined; indeed it seems that on AIX with their compiler, doing a 30-bit shift on (INT_MAX-200) gives 0, not 1 as we might expect. The obvious fix is to make id and oid unsigned: l (level count) is also logically unsigned. (Note: Samba doesn't generally get to ids > 1 billion, but ctdb does) Reported-by: Chris Cowan Signed-off-by: Rusty Russell Autobuild-User: Rusty Russell Autobuild-Date: Wed Oct 6 08:31:09 UTC 2010 on sn-devel-104 (cherry picked from commit 2db1987f5a3a4268ce64fe570ff598e3bf4ecc73) --- lib/util/idtree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/idtree.c b/lib/util/idtree.c index c14796101a2..6611992a25f 100644 --- a/lib/util/idtree.c +++ b/lib/util/idtree.c @@ -105,7 +105,7 @@ static int sub_alloc(struct idr_context *idp, void *ptr, int *starting_id) int n, m, sh; struct idr_layer *p, *pn; struct idr_layer *pa[MAX_LEVEL]; - int l, id, oid; + unsigned int l, id, oid; uint32_t bm; memset(pa, 0, sizeof(pa)); -- 2.11.4.GIT