From nobody Wed Sep 10 14:22:11 2025 X-Original-To: dev-commits-src-main@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 4cMNDh0lWxz62jRc; Wed, 10 Sep 2025 14:22:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cMNDh0Bq0z41Vm; Wed, 10 Sep 2025 14:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757514132; 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=fRWHuXjNL0t8d+QNmWGCQbyFgNcENMR62ZOPqhMJB1k=; b=CCUD3Q9PF5UrkCfgV3fwpwIZvxqMwGCax3S24w0xSXqP7bAeLeVJ3++MMPyD8W0hMzX5Sc sCiG/yb0N5nD6QtoJIX/Hehsd5B8ZrnUQH53h6v2BdncuVkIS5mF5rGqDsZPmHPouhduf+ 3Q6hP9iTnplijft+iPmm8+UFnnjxIlTFL1QGJmJD9CApA1Li+wr1b9TGYhP4HuLyhDTjti C988JbSe9hlDDMEAnB/BTmCeN/Oq+8GNlqLL7m/L6/AYgimiZNNLla56rci+gw89i4ivS7 CXCe59fAFFfVfB96SHmJ/pp261OpxSij//pFCTFUIprswVMfQlmjyULtmAo4Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757514132; 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=fRWHuXjNL0t8d+QNmWGCQbyFgNcENMR62ZOPqhMJB1k=; b=ESBbvspo03eqHYd1O9cGF/t/PEEqQn49AiGnuI6iiZtK6nirjX+IAneDXcmf/NImeCzdu2 h4nJqax+HudhcbFInxMMnnkqk3LEAVuLKmW7/VgT47AO1Mj6nWqbgx1cAJTAlfRyuP0AOK x0L4iOqsEzc/kIqRUnNrwnCd9FHgcjfrUsyCrfmupQ/hXLVNjtEEGOsfNlpB0QrWMv7rhv Z2Y/k0160b1HK8BGVfORxKh6VA024qP1Ikd0tLzVJoAV1Mc189XmBS1O+hYLN5QI39xJoN dASt43dW1jL8ZCemB2Nj869asi/fUpt0IBeBHb83foWzbFB+Tew4uGRxnXx1kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757514132; a=rsa-sha256; cv=none; b=H3GUE9z2KkeEImiPv/ItuoRRFcYPMreIXfGMGbcd3YpDebIL1wf+GtGpQxGdPCAQTm4xVd DverQLvbM9vr8bEugG1N47EMLk2oaVSgFkI4hBM8DMz6yOtZv5HjxIvv50x1V73jLgYWLb Kk+9P5NcRMMAvWtvZBZD2c0nnxESZsxnjwf/H4iX4VetBcC/l3k02Rt4rXBWY4UGu3Gf0S uIOQDqgOJX8VbzpVxr/ZmzY9eLwgKt7HSZIsAJJ9hqyFHl7sOCQDtVoB9UceDaAEwNzubf JsfrFpRS+thjoIZ0XP54NTr/emmHy3/illCwMjwg6Cy8YWOfGHgFZd932ajoIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cMNDg6mt9z8dd; Wed, 10 Sep 2025 14:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58AEMB6P075855; Wed, 10 Sep 2025 14:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58AEMBLi075852; Wed, 10 Sep 2025 14:22:11 GMT (envelope-from git) Date: Wed, 10 Sep 2025 14:22:11 GMT Message-Id: <202509101422.58AEMBLi075852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f48b1a34ef85 - main - Fix possible out of bounds read in armv8_crc32c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f48b1a34ef859ca17de0cc9149cc22e07364ef85 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f48b1a34ef859ca17de0cc9149cc22e07364ef85 commit f48b1a34ef859ca17de0cc9149cc22e07364ef85 Author: Zhongqi Zhao AuthorDate: 2025-09-10 14:21:38 +0000 Commit: John Baldwin CommitDate: 2025-09-10 14:21:38 +0000 Fix possible out of bounds read in armv8_crc32c Reviewed by: andrew Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D52401 --- sys/libkern/arm64/crc32c_armv8.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/libkern/arm64/crc32c_armv8.S b/sys/libkern/arm64/crc32c_armv8.S index 649afff4b711..430b24f7615a 100644 --- a/sys/libkern/arm64/crc32c_armv8.S +++ b/sys/libkern/arm64/crc32c_armv8.S @@ -39,14 +39,14 @@ ENTRY(armv8_crc32c) cbz w2, end tbz x1, #0x0, half_word_aligned sub w2, w2, 0x1 - ldr w10, [x1], #0x1 + ldrb w10, [x1], #0x1 crc32cb w0, w0, w10 half_word_aligned: cmp w2, #0x2 b.lo last_byte tbz x1, #0x1, word_aligned sub w2, w2, 0x2 - ldr w10, [x1], #0x2 + ldrh w10, [x1], #0x2 crc32ch w0, w0, w10 word_aligned: cmp w2, #0x4 @@ -69,11 +69,11 @@ last_word: crc32cw w0, w0, w10 last_half_word: tbz w2, #0x1, last_byte - ldr w10, [x1], #0x2 + ldrh w10, [x1], #0x2 crc32ch w0, w0, w10 last_byte: tbz w2, #0x0, end - ldr w10, [x1], #0x1 + ldrb w10, [x1], #0x1 crc32cb w0, w0, w10 end: ret