Date: Mon, 18 Apr 2022 16:39:34 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 6955dbde7ad6 - releng/13.1 - ctf: Avoid passing a caddr_t to roundup2() Message-ID: <202204181639.23IGdY9Q085904@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6955dbde7ad6eb0d6674bf461882f20143c24e8a commit 6955dbde7ad6eb0d6674bf461882f20143c24e8a Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2022-03-07 16:18:40 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-04-18 16:38:54 +0000 ctf: Avoid passing a caddr_t to roundup2() For some reason I can't reproduce this locally, but Jenkins complains. Approved by: re (gjb) Reported by: Jenkins Fixes: bdf290cd3e1a ("ctf: Add v3 support to CTF tools, ctf{convert,dump,merge}") (cherry picked from commit 3fe1f21fb364e38f2bf7e7100dad59b067b27080) (cherry picked from commit fb89cf93a5c79f60e8eb38db77294f8c713c4081) --- cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c index b3b4c1f7168f..01b18093443b 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c @@ -1333,7 +1333,7 @@ resurrect_types(ctf_header_t *h, tdata_t *td, tdesc_t **tdarr, int tdsize, tdp->t_fndef->fn_args[i] = tdarr[argid]; } - dptr = roundup2(dptr, 4); + dptr = (caddr_t) roundup2((uintptr_t) dptr, 4); break; case CTF_K_RESTRICT:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204181639.23IGdY9Q085904>