From nobody Thu Jun 29 08:20:49 2023 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 4QsBGn2ZJLz4knl2; Thu, 29 Jun 2023 08:20:49 +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 4QsBGn23fzz3wWB; Thu, 29 Jun 2023 08:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026849; 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=ZC9mohJWBJ4tmBTMKttWJd+wTZ5f8rybEADC+kjqX9c=; b=D678LgVA228bAo3Obaa46bpXQnk7lZsQ5i5psP/s6sZYH3/4v163lx6LfOAYRfUZvargbZ fUWlSSc8JjXataM400ceugAQkfoKAxOFaLst8yqUIVVUcstuqTcfcMd20y6kNGiEtPMVxg CLlcN3Na2epZQyVpdHHQkmChi3XG5H6PreZJSl+pzpwoz+PUY0ytC65psQrP7IS7xxiU9W qezYtqoF7YBightWp9ZxrwXDExschRWCVUhNsS2l9e6LW9leylQpub7zzIp+YfPHpqxNOz jgb8ulpSyKrzjeSSauUJVe9iXUtd4A7awAsHSD9jnWkr6rHF8gUCSyI5rI8RVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026849; 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=ZC9mohJWBJ4tmBTMKttWJd+wTZ5f8rybEADC+kjqX9c=; b=os/BLuy7M1F3EzNB8eEDUxE9yktboIWlaSj7IvQ8SUVQ8B8Mwos7s8mj7xPzjn3i2V070v bYHZYBx7Xh0M38xWv6fnBIoOREk+l85w2im9Al9uqZe7/yPJ1s4v9qI9gjsDE6bPxAnJa7 YXqSxjngQfI8bwAkMhmoLMK9qcGIFE1WhddVHrwxvXF1aAOyqReNfyombKsHn9UQv0cmd0 guCsw3FOYiCRzXcdKvaCkgKJ8ZwTZ8bEZWMO2xlkMvlGrYzFdOnXaSHbjGw92POk+2wY2r gY7l33mICX9eQlJeAfFeq2hDUS+FZISUdpHoM7QsTBfpEbF//CwPnaXQ72GrWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026849; a=rsa-sha256; cv=none; b=qfmh3ZjVgajvl+E83+zX4ZxNjfsYobJORellOv1yNLtOep6sZdaxgy1ovlE1KMF9/sSXpt dM2ztCIiY890tiwH4ZF7sH7OYl7dvymHc5kVSIPlPXm0js5y3pECEXVZu+lTc31ptYeRv/ XEGBJhD5lKw0/IDP+1/TjsNgPfcSh52f/dVBZqIBJyXKF0+7/yR78Z31/JIAZbv+K93u+w X+vczJ908h6H33jEgbpNZNpgCcmvwcRLBqwPy4osl0JWHCjFma6kFOr+FqCDaF3xlrzMw9 dR/2VL1cLtGYV/pJ8jyWILtpSFZG6XVLnJshHigyJMg6EDtpDLLMfiC9OKW1+Q== 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 4QsBGn10Kkz17QW; Thu, 29 Jun 2023 08:20:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8Knuj085746; Thu, 29 Jun 2023 08:20:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8KnsR085745; Thu, 29 Jun 2023 08:20:49 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:49 GMT Message-Id: <202306290820.35T8KnsR085745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 0aa326f7b384 - stable/13 - linux(4) rt_sendsig: Remove the use of caddr_t 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0aa326f7b3842178986a3c7a8889965505c61856 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa326f7b3842178986a3c7a8889965505c61856 commit 0aa326f7b3842178986a3c7a8889965505c61856 Author: Dmitry Chagin AuthorDate: 2023-06-06 20:01:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:16:02 +0000 linux(4) rt_sendsig: Remove the use of caddr_t Replace caddr_t by more appropriate char *. MFC after: 2 weeks (cherry picked from commit 84617f6fccd45505f3eeebad1c8cdce1140b7f8e) --- sys/amd64/linux/linux_sysvec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 53eda1cbc7c0..2383a4dd6632 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -409,7 +409,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) struct proc *p; struct thread *td; struct sigacts *psp; - caddr_t sp; + char *sp; struct trapframe *regs; struct savefpu *svfp; mcontext_t mc; @@ -439,9 +439,9 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) /* Allocate space for the signal handler context. */ if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack && SIGISMEMBER(psp->ps_sigonstack, sig)) { - sp = (caddr_t)td->td_sigstk.ss_sp + td->td_sigstk.ss_size; + sp = (char *)td->td_sigstk.ss_sp + td->td_sigstk.ss_size; } else - sp = (caddr_t)regs->tf_rsp - 128; + sp = (char *)regs->tf_rsp - 128; mtx_unlock(&psp->ps_mtx); PROC_UNLOCK(p); @@ -496,7 +496,7 @@ linux_rt_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) for (i = 0; i < nitems(svfp->sv_xmm); ++i) bcopy(svfp->sv_xmm[i].xmm_bytes, &sf.sf_fs.xmm[i], sizeof(svfp->sv_xmm[i].xmm_bytes)); - sf.sf_uc.uc_mcontext.sc_fpstate = (struct l_fpstate *)((caddr_t)sfp + + sf.sf_uc.uc_mcontext.sc_fpstate = (struct l_fpstate *)((char *)sfp + offsetof(struct l_rt_sigframe, sf_fs)); /* Translate the signal. */