From nobody Thu Apr 07 00:31:06 2022 X-Original-To: dev-commits-src-branches@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 BEE0C1A953D3; Thu, 7 Apr 2022 00:31:07 +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 4KYj3b1Rwyz4snw; Thu, 7 Apr 2022 00:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291467; 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=SdghBrXpbHdrTwA1UFSdIj9SNc7bh4obb5frFNm/Eb0=; b=YB/2nF7DwvdKalgIjpCEzEdyWw2kwmf+lTJ1taVJoSRJyG8X8F3dvX3K2z13YbHkSGcfMm 4lJANDxtYC1/zP4azWPw52ymhKoyVsIgpAiPjMco/mEFMH72kM7Y0tE+4WVyN/MAPOG/4q YV7ybxwIi3YbYAhvn0UfC6rlg/NSFdElatRLfAE4I1989Gu0v684BphWz43TF3kLwOp7Uu FVJNrLtAFnZlQmd7hg9rOF3nbb4Q5zyp/G7578pUU9ln4SOfUFr/I0wqNl2rZDfy0r8APV +gmvDbW72Zpkf+0mW9JDj1DlsONPRtqljV28A2lyQ7Bn5j+tsbR8TNNh5moykg== 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 00F0F2576D; Thu, 7 Apr 2022 00:31:07 +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 2370V6PY073582; Thu, 7 Apr 2022 00:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2370V6wV073574; Thu, 7 Apr 2022 00:31:06 GMT (envelope-from git) Date: Thu, 7 Apr 2022 00:31:06 GMT Message-Id: <202204070031.2370V6wV073574@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: fb89cf93a5c7 - stable/13 - ctf: Avoid passing a caddr_t to roundup2() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: fb89cf93a5c79f60e8eb38db77294f8c713c4081 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649291467; 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=SdghBrXpbHdrTwA1UFSdIj9SNc7bh4obb5frFNm/Eb0=; b=YRs7uNFF2HbSX7Njk8BUG8lqUSwmWulUmo6U4UD13hO90yrLCLrG1/vSCjTEk8zSCTgtOo LamVcULV8oivPucyo9sOYAEYs/yC6ahUh3Gt2aPOqPsn6c+XpDnUvlU96eHi/MJPFqoCG8 g31dW4ATvrfODqrvfAuEqi/TNInTtMyEjKzFounzJot31nPAJznh4mLbockPSyJS8OUSDN HWvtmoxpYr3Gk/xjLP6Fv1Prk6hEGLe8GKznZ4GKDeRLDPfOKxdOdRjHpMKoTRAqeTQpsF KV6DVW1mPbHCjUOLXvH7pSHae5ayKFA3Pkdm2eEMmibqjNNyDneSKTOWGUlCSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649291467; a=rsa-sha256; cv=none; b=f4pvsZ41jqYBIElWQ85DxKa5Eeu1UE3ht1o8V/YT95Ngdig0oDV0EkAnYUT8pXwQ7UZX88 dKrZtRzaHwxFSNIcst9OupFoKmn2YRsDZOT5ifv3DOfDPM33moIJ+WsbqtOhT5yim6gqY9 uLHo4/Y9Afsf75YsqKgYCeAmMesP63SslaphgxhJxHr7MOrkSLTbAgs63lRrmp2MBJLNLB LCWuo8r0PvlOeK1ESkBNgv15qZQ0r90KFzKklK00tSqc1fBfRi+a48kk4ZW6jMuWleRG0K CzijXN8yBtAkLEdbr6UMHwgMDDN2aEO1lrv9lMrNWt8rUQmUq7d9Zkrtn/0/Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fb89cf93a5c79f60e8eb38db77294f8c713c4081 commit fb89cf93a5c79f60e8eb38db77294f8c713c4081 Author: Mark Johnston AuthorDate: 2022-03-07 16:18:40 +0000 Commit: Mark Johnston CommitDate: 2022-04-07 00:30:45 +0000 ctf: Avoid passing a caddr_t to roundup2() For some reason I can't reproduce this locally, but Jenkins complains. Reported by: Jenkins Fixes: bdf290cd3e1a ("ctf: Add v3 support to CTF tools, ctf{convert,dump,merge}") (cherry picked from commit 3fe1f21fb364e38f2bf7e7100dad59b067b27080) --- 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: