From nobody Fri Oct 28 14:10:54 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 4MzPbL4JKbz4gB1g; Fri, 28 Oct 2022 14:10:54 +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 4MzPbL3q8Xz3hnH; Fri, 28 Oct 2022 14:10:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666966254; 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=jja869stX1b+zWS7CG+naglxpMxzUpg3lImiNFEqDyk=; b=lkrSOoECNItUXgyxqhw+P44v/kLifinybDgMV4K9bbhNhpoJSu+swBngBcfgZPTtjlDfkf UHIjUL0kxDWknPmRxJkr24kFqdUV1fJYH0imY2RyK3/MkrUt2B4sULYmj3+qDvaIyTuR3q O4Lv74I7F/DKPiKjpWmxFs+pbpBeR6GWgt49woTwysSH9y4UMngRaOvQR9X5ivm8fDEwOY uqaDPPcw0GeHLs4gxnZJlEOIpemi5CA7Ihzf0qJQ4D5aNbnJI2JJth7FEWHumQRUVNE5OH +mcBXDn7g+glN9tZ8KMW/JUH9cY+LIXkQHkjBbS3pvlVRQE5s7ccfzjct6+xUg== 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 4MzPbL2v2nzgjW; Fri, 28 Oct 2022 14:10:54 +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 29SEAstA037248; Fri, 28 Oct 2022 14:10:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29SEAsXM037247; Fri, 28 Oct 2022 14:10:54 GMT (envelope-from git) Date: Fri, 28 Oct 2022 14:10:54 GMT Message-Id: <202210281410.29SEAsXM037247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 0cc04135734c - stable/13 - riscv: fix relocation handling for R_RISCV_64 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0cc04135734c84558aa7b9386c1eda569b55b981 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666966254; 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=jja869stX1b+zWS7CG+naglxpMxzUpg3lImiNFEqDyk=; b=UildF1GF2jp2Erbku2wn8oLY5tQYqx9mAEUvNhXR8d/0BZiSDcxKFbrFYFHUVy6sShCCXs Syeh0HBvaUNk/sUqzy1OeatIqZRqy/t4lFyZXwrYDAtR0hmMPeGUhP7XLtxWCVTMf624dH BVgP1rVL90VsToxSEnM+WvnF9X4x/NTmkht/PvJYBHI09Ijhk2GIHXZ8+TB9ssNhNosD74 AVkqlMLgSr1y5kTn+ETbBCi/rpshyb0yHStdNXyJjDiZSrNh4hmbe54tEZ3FpdowlRpikF wa2+W+GYF8/s9DEzrtrH3jGeqMhrU2XsTng5p1kAczfGJFX2/2265brnCvyFZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666966254; a=rsa-sha256; cv=none; b=kV5FpR1YwLcxX+OUlOuimkhFa/CQkFZmQRx5qDcwoYuR/Ech2x6AOzoGM7PJeN4o3Zw1E7 Gf3M/Vlefs6waBXJY7uG1mJV9rfYy9FQA8FYfPoVzgxqsXGLPhbfY/K6mZOrKxIJ6uTMP+ 0le/jCkoBd+40XKePLUZ6vbKFeUWzcII/kPsK9oMvL++rCI2cT7n8jwTO8LwiVmG4/EjGZ yRIeU8+uwAVMURLry2Hb8giAlm7k1rkHLyx97kg0wA9HfWsVWkt1kGRDy1MLdRRgqKL61R u0wlcwSTmYmdu5OHujwfumlXmHFntAb7YCkxBEg7Mgnk9hUMqP38b/+4X89F+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0cc04135734c84558aa7b9386c1eda569b55b981 commit 0cc04135734c84558aa7b9386c1eda569b55b981 Author: Mitchell Horne AuthorDate: 2022-10-20 14:56:59 +0000 Commit: Mitchell Horne CommitDate: 2022-10-28 14:10:37 +0000 riscv: fix relocation handling for R_RISCV_64 It requires the addend. In practice this doesn't seem to be a problem, since relocations of this type are all with an addend of zero. Obviously, we still want to handle this correctly if that ever changes. Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37039 (cherry picked from commit a9b24e4dc28abfe668038e4c053d77b6dd4dce19) --- sys/riscv/riscv/elf_machdep.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c index 68c7afb4d09f..b3d8ac54a36d 100644 --- a/sys/riscv/riscv/elf_machdep.c +++ b/sys/riscv/riscv/elf_machdep.c @@ -340,15 +340,25 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, break; case R_RISCV_64: + error = lookup(lf, symidx, 1, &addr); + if (error != 0) + return (-1); + + before64 = *where; + *where = addr + addend; + if (debug_kld) + printf("%p %c %-24s %016lx -> %016lx\n", where, + (local ? 'l' : 'g'), reloctype_to_str(rtype), + before64, *where); + break; + case R_RISCV_JUMP_SLOT: error = lookup(lf, symidx, 1, &addr); if (error != 0) return (-1); - val = addr; before64 = *where; - if (*where != val) - *where = val; + *where = addr; if (debug_kld) printf("%p %c %-24s %016lx -> %016lx\n", where, (local ? 'l' : 'g'), reloctype_to_str(rtype),