From nobody Mon Apr 18 16:39:34 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 68BF011D496B; Mon, 18 Apr 2022 16:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kht1y36Cdz4vJb; Mon, 18 Apr 2022 16:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sHAZEV2lSj4jZY62WTTneCvaixe9Y4wBoVmab/ifVM=; b=vqNlYg6JpCNNsp6Wf0j6m//wJP5v+y0yToB+d3u5ka/yZFzIXjdFRSHDL8q6A/C1+GcdLB cXlKwJTSWdcChHCA9bxeMP8l3ez2L/wIar/igGdMQwNyVZyyzqCkE+WzR8Qcq5ZIHYGEjr B6+HVWiAGURgWddrZIIY0M7k8XsQxTBLRRdydJpLynQUPYMirj9Lv0Kkh1d7236Yuco6nf qN6mw6qUXZ4AD30NH3WIZsp2Ngeoopd+1CREyHhepPdfafgPdNunf5s5Nl4T/b5beRc8It BcwE3UOIzrZyDI0pKib6MALvIYb4gEddbWpjRs58qniuEoFJr3RpcvnT3u6Huw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 47A36164BE; Mon, 18 Apr 2022 16:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23IGdYIU085905; Mon, 18 Apr 2022 16:39:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IGdY9Q085904; Mon, 18 Apr 2022 16:39:34 GMT (envelope-from git) Date: Mon, 18 Apr 2022 16:39:34 GMT Message-Id: <202204181639.23IGdY9Q085904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6955dbde7ad6 - releng/13.1 - ctf: Avoid passing a caddr_t to roundup2() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 6955dbde7ad6eb0d6674bf461882f20143c24e8a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650299974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sHAZEV2lSj4jZY62WTTneCvaixe9Y4wBoVmab/ifVM=; b=be8i0omxX+b9YDXhRDofWxXYdAgSxTxy65xuTwFUPlASwP/5dZvvoIHpDwrGWGk16YLb4v A4pHIHzI5gUfAbBHF4N/xrkOeqTbB2lhmzK/7y9vtAqRbbHDDtqwXqBLOIPaLQA4VffYTa rytkgilxTLHCErVMdMitG+pbLoexKDEjB0+yNdw/l6b4PG6bStKuiIgqfSBGCzZYNAnlBT u5xn4PoXWPwAZMOT7K3vaHuJMpJIkJ45/zUS0AxEHKgVoJnYTonS3fNBcP4ntwEewY1taS DdZ0KkgJjFFXLlyOqhSniIwjob5RzYyjxK/P8Pis1OkwE3welSM8VAGzvayeww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650299974; a=rsa-sha256; cv=none; b=yKxcV1BX18Sq8VcztXI3im9JyEFDnjaYVSaOE2FCgC+hE3cz2qzEqIHucs14TjugBUAIWC 6EKOKtcMGtzH+4dCI+FydKMoF3aVlsj2Pr8LSiErTEAuf61htX8z+U9brrJyb0M54tDFku eMNFCicKX01z10wkeDpZcYpYcz9gxFXUilAQa7EmupJ6VvPRR4yb2wE6lJ2ubUG8GCBT7B FwFLJTmxaqL9JH47gGIUwFyseDC7Ad8Lq55ewK66opNsbnPGIoV4+vtTcwqOe94/z4maUf ioT3aF+cECJvZ57IHQ1G+SZWKaSAD0g63wYytx9eb4L1Af6NBwzsq49qbJzcjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6955dbde7ad6eb0d6674bf461882f20143c24e8a commit 6955dbde7ad6eb0d6674bf461882f20143c24e8a Author: Mark Johnston AuthorDate: 2022-03-07 16:18:40 +0000 Commit: Mark Johnston 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: