From nobody Thu Aug 25 17:31:43 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 4MD94b522nz4b38T; Thu, 25 Aug 2022 17:31:43 +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 4MD94b4Nvzz3L5D; Thu, 25 Aug 2022 17:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448703; 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=3sobleBLKpgbq8uQS2zW/LuFblGqAONEOVAdoy0LpY8=; b=DCpq9BNZ965cN/0UIFmiCnUIJo6P801Lj6Btq7tFlLXiSIgeedwBvYPsevP553s2XuSn1b 8/ceteWyVNqcSbArAUJvLkKFGCWHcJB2y/rVsF5Sz1gE499dzAzQWz6iUl5ocVmIjyC8V6 FUisEAhKm0CUTEOkLAX7qEyRqvVlaJqwfweZTzEM+lGZUj77z7ZpQ/DXilsPP7TySIkL9k hJgGRTUonRzb0FqW+1AmHzfpc1bpO6fBdhJtzrYidYRLZ71/AIQ+C5YYHEy4nbBENsyGPV zsfNkl0QYd+v3E1+0JSsyFhuqSyJJJvhNmNXtLFs47FlQcERHCP+GYVjmczQwQ== 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 4MD94b31H6zwxm; Thu, 25 Aug 2022 17:31:43 +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 27PHVhUR043528; Thu, 25 Aug 2022 17:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27PHVh0g043527; Thu, 25 Aug 2022 17:31:43 GMT (envelope-from git) Date: Thu, 25 Aug 2022 17:31:43 GMT Message-Id: <202208251731.27PHVh0g043527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c1434fd2deaf - stable/13 - bhyve: Validate host PAs used to map passthrough BARs. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c1434fd2deaf66a0004cabd4d893584652b24f80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661448703; 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=3sobleBLKpgbq8uQS2zW/LuFblGqAONEOVAdoy0LpY8=; b=Qty2hxQ2K/ydWZSt/w1gqnFlwkLx9YH+qY3gXqg3OKh0+eSdjR/chjXWyGJnAePhnpg8bp F46MZumC415T1F/9zbH82F681V8tPELNNgXYtwtx5dfqpl5dHV3Pw48YEwpokJAO4Qnuto SClPEb81X8Ov2DnsuMGPYheHc9dJCOS3kuFz//2/CWAnrWQ9/8foJOZ0WRCQ9OJ6rg0X8b 1mhQxCIrM/Y8D7/mqtIQ+mG80FOiuwAOw124P6IfmtRGYgA2EUfZgIV+QiUjFydbNcwszD z29GQ8CCT3flwTp1J+yvNx8cIY4PdeCF01FTf38N1vKRdXEXZSqodvLAWXvErA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661448703; a=rsa-sha256; cv=none; b=F9X3r5MV1ucQNXFMAFq+pakEjijTRotr7nwVNC3BbComw1+pMtGOX+vsLQCLG8cCoKelKN eXSJrHwHhVpNOuYGJG88qgLF25b6uudO+LU4OT9zwDPcgHm4UJNz4BpZCr+GfbcMQiGMF8 WhNTqz871KGZ1Ath+YLploFSyIbz42LmynAKJdx72scBT0TsuzdDt3Y1pUyru0EpfjohaC LtIh1x10spp/zp5hn6E/BNW1YDHYD6559j6WInDt+v+tM0a0Q/F47mZkiP2HUAciBuw/x0 Z+Z2072n0qKjvcnsckrxIiUUhRFJ4GShzCHGAI5bi59QzkZGJhT1/TMIp7tq/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c1434fd2deaf66a0004cabd4d893584652b24f80 commit c1434fd2deaf66a0004cabd4d893584652b24f80 Author: John Baldwin AuthorDate: 2022-08-19 21:59:44 +0000 Commit: John Baldwin CommitDate: 2022-08-25 16:38:56 +0000 bhyve: Validate host PAs used to map passthrough BARs. Reject attempts to map host physical address ranges that are not subsets of a passthrough device's BAR into a guest. Reviewed by: markj, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36238 (cherry picked from commit c94f30ea85b745a5137471876013f79689e0af03) --- sys/amd64/vmm/io/ppt.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index a936326e8df3..3782b7b510f6 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -440,6 +440,23 @@ ppt_unassign_all(struct vm *vm) return (0); } +static bool +ppt_valid_bar_mapping(struct pptdev *ppt, vm_paddr_t hpa, size_t len) +{ + struct pci_map *pm; + pci_addr_t base, size; + + for (pm = pci_first_bar(ppt->dev); pm != NULL; pm = pci_next_bar(pm)) { + if (!PCI_BAR_MEM(pm->pm_value)) + continue; + base = pm->pm_value & PCIM_BAR_MEM_BASE; + size = (pci_addr_t)1 << pm->pm_size; + if (hpa >= base && hpa + len <= base + size) + return (true); + } + return (false); +} + int ppt_map_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) @@ -448,10 +465,17 @@ ppt_map_mmio(struct vm *vm, int bus, int slot, int func, struct pptseg *seg; struct pptdev *ppt; + if (len % PAGE_SIZE != 0 || len == 0 || gpa % PAGE_SIZE != 0 || + hpa % PAGE_SIZE != 0 || gpa + len < gpa || hpa + len < hpa) + return (EINVAL); + error = ppt_find(vm, bus, slot, func, &ppt); if (error) return (error); + if (!ppt_valid_bar_mapping(ppt, hpa, len)) + return (EINVAL); + for (i = 0; i < MAX_MMIOSEGS; i++) { seg = &ppt->mmio[i]; if (seg->len == 0) {