From nobody Thu Jul 20 20:44:55 2023 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 4R6Pnh0dBnz4dVgY; Thu, 20 Jul 2023 20:44:56 +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 4R6Png5KrDz3QgF; Thu, 20 Jul 2023 20:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689885895; 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=5rw2Wt08nn/MwqyRHjadRUI9aOFtw3Gtd8qLC1+zPyQ=; b=SPVHzjFzNnWvW1X6L4RiogCFbz1938DiPhmjCqNYqJXu+JgIFu1md9/K1lXAOCWgfo+Lys 3uk6O01uZrbx8zBgrokBG+gXVI2DiiMqSprHYiMfZ1r03iZBh9vv++f0G1jZAauF3no0os 8f984QEePG0SpAcWLi6fxN9yLSHjHT/PJK7GtzDyNymmBLgBg2czrDcmQOMIJ/+NajHBRW wZUMpu8SQongaWmAkvzXBRel6SmH9xjsSnK98QgpcWfXdHJu/4Ud2D8Os4KlVqjBERFV8Y i9sKMLvzzi+Y0lKv0slze8D2PXgisDgmKMnBm9oqvA83mpYfLBX7vOLzc0zchg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689885895; 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=5rw2Wt08nn/MwqyRHjadRUI9aOFtw3Gtd8qLC1+zPyQ=; b=ehIZgBgWDl+19kzDymi2wDLD8TD5EPM1J+zed7dvwwHobgB1+Ej5wtjW2+wIRf6pCr2GPf 8i8HWYKq2feZo7F5cD4A59r4COq7wR6NcgwzTC9WoQDccSAY0Isjfq186Sw1knFW/gpn56 TylfC4b4omhFrKeBh0AA5mR4k7jzST3tY3SDu8sbsbjZlT8AhdrhY274cKyVTOQwYViB/J mN9I+mrDdOP7Z7KRNg9ZRI0AJrI+39+5sHPQJ74qKcflpAERT8+/yRN4wQdq9o4tyG9l7B 4sWJysZ2/Vf33FwvFM6fexDXsfm+M0Hp5uNXVPfxjiElmZ397HX9MxbM2+hhAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689885895; a=rsa-sha256; cv=none; b=ckw3akga7AH4L7vkNaqFDc27GZgIsqbYws85A4Frrx2b/0LDQnQpUTx5CmCTAjdBSnJVGh ytVK0iV84Pm6SoRHcNdBZRJNCc1BsQLhjGi74AN7KyQr7dGnewjPKyfXOnhiYGXjWRiarm Gf/9mahz8sm5BFJ1nhTjskRk+Tc0O+e7lOVC8i4rE2tWT/8y5XKNb2oY3mIHu1pM/XQPTm U98V4nsJAtLTGB8UNhXDYOBvwS6nYva9wwPkAafUs5V5THGJDoBqTapSlogbX70YmohQHJ u6sLd1ykkCG9POfO5Q6zp2d3eAvlpcErdW6Is8gEaKW0CBiCsyEXfTqtQ4WFhA== 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 4R6Png4G9gzlGv; Thu, 20 Jul 2023 20:44:55 +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 36KKitXR035770; Thu, 20 Jul 2023 20:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KKitrI035769; Thu, 20 Jul 2023 20:44:55 GMT (envelope-from git) Date: Thu, 20 Jul 2023 20:44:55 GMT Message-Id: <202307202044.36KKitrI035769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 9e752dae4ce1 - stable/13 - oce(4): Don't directly access usespace 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e752dae4ce125d873f12fde993e0466ed42b54c Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9e752dae4ce125d873f12fde993e0466ed42b54c commit 9e752dae4ce125d873f12fde993e0466ed42b54c Author: Brooks Davis AuthorDate: 2023-06-14 17:55:41 +0000 Commit: Brooks Davis CommitDate: 2023-07-20 20:41:14 +0000 oce(4): Don't directly access usespace Replace direct stores to userspace addresses (never safe and broken on modern CPUs) with a copyout. Use a static assert on the size to ensure we don't overflow the field. Reviewed by: markj, jhb Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D40519 (cherry picked from commit 758927a982db0ae3ebb02c05aec8a53bcc0c20cb) --- sys/dev/oce/oce_if.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index 1127565282c1..2d089344e844 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -2250,7 +2250,6 @@ oce_handle_passthrough(struct ifnet *ifp, caddr_t data) uint32_t req_size; struct mbx_hdr req; OCE_DMA_MEM dma_mem; - struct mbx_common_get_cntl_attr *fw_cmd; if (copyin(priv_data, cookie, strlen(IOCTL_COOKIE))) return EFAULT; @@ -2282,17 +2281,25 @@ oce_handle_passthrough(struct ifnet *ifp, caddr_t data) goto dma_free; } - if (copyout(OCE_DMAPTR(&dma_mem,char), ioctl_ptr, req_size)) + if (copyout(OCE_DMAPTR(&dma_mem,char), ioctl_ptr, req_size)) { rc = EFAULT; + goto dma_free; + } /* firmware is filling all the attributes for this ioctl except the driver version..so fill it */ if(req.u0.rsp.opcode == OPCODE_COMMON_GET_CNTL_ATTRIBUTES) { - fw_cmd = (struct mbx_common_get_cntl_attr *) ioctl_ptr; - strncpy(fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str, - COMPONENT_REVISION, strlen(COMPONENT_REVISION)); + struct mbx_common_get_cntl_attr *fw_cmd = + (struct mbx_common_get_cntl_attr *)ioctl_ptr; + _Static_assert(sizeof(COMPONENT_REVISION) <= + sizeof(fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str), + "driver version string too long"); + + rc = copyout(COMPONENT_REVISION, + fw_cmd->params.rsp.cntl_attr_info.hba_attr.drv_ver_str, + sizeof(COMPONENT_REVISION)); } dma_free: