From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 48B78385152D; Wed, 26 Oct 2022 15:11:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 48B78385152D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797078; bh=/DCRojZWQu6jM63AragQprIACCfBCESCOnmnh1dRLzM=; h=From:To:Subject:Date:From; b=R/Xs7zVWYOfFdf1uGG4bKMzktqGaZ8jGL/cXk1mhSJ4qakqf36ml7Z9+bygpsmt0D G/ZVgtVpKjD2bnDL8Yc85lpQWjUJ7wIjd4DOtv8WlvAdDfFJl1r4+TOj5h6QVnXQ3l 09MxQGqJR41N1XobU+VuizYvpRBGPIP0pa2o+xyQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: Fix pointer alignment in fts X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 876cc51c8e936542a21f6da04f4aed3793189599 X-Git-Newrev: fe148f704fbc0664be391c264a6715456e1d0fa1 Message-Id: <20221026151118.48B78385152D@sourceware.org> Date: Wed, 26 Oct 2022 15:11:18 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fe148f704fbc0664be391c264a6715456e1d0fa1 commit fe148f704fbc0664be391c264a6715456e1d0fa1 Author: Szabolcs Nagy Date: Tue Jul 12 10:59:16 2022 +0100 cheri: Fix pointer alignment in fts ALIGN has to work on pointers and the code assumed unsigned long can always represent pointers. Diff: --- io/fts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io/fts.c b/io/fts.c index 283cf1791a..5a0a47a360 100644 --- a/io/fts.c +++ b/io/fts.c @@ -55,6 +55,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #include #include #include +#include #include #include #include @@ -67,7 +68,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif /* Align P to that size. */ #ifndef ALIGN -#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES) +#define ALIGN(p) (((uintptr_t) (p) + ALIGNBYTES) & ~ALIGNBYTES) #endif