From nobody Mon Apr 13 23:34:13 2026 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 4fvkJP3R6fz6YT8f for ; Mon, 13 Apr 2026 23:34:13 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fvkJP2ZLvz3Nlc for ; Mon, 13 Apr 2026 23:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776123253; 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=mU5lyDrozgEwuclXJPAOoFeACYsRGClreBFstSY/gPU=; b=VHZJlGh1gEls0l3eJpGocBm5XB0EYveFCGSsAkY06X1MrYIW49uGQZdENSVXE4F5Xh7cDV tZdymJlty/wMr4DX30NFzhRvJ/QV66V3NUN6aD7k7M/+hnVNvcaVmuVRElpFD116YyS7YG ZyMzd269wAgXT9XktI4+Thp65dbEJPh7c6IfKXP78CjtHW7vb8NxQ2onleYiNN511G2XEI lODAlXx07XYHRJ41dYQs1wFUuq7/29Fiv09Fz/b0EQiqCknEVlXihsdDLiUh6waTXCFOLy Cus31LyaPcXQelgpftgW/DLfFIVmon6MBNAZLleOGREvSHACIWa0XK5uo0FIMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776123253; a=rsa-sha256; cv=none; b=V0DzC5GNWJW/BD+2TMFsbIUdSZMxflqjTlKZjKEazaaza/1WcW7cBSjqI32AvCZNsbOx2P OyY7uHtrofT+P9XI0hi/DKatzmbHauIZ7o0H30GelSTc3KbgcQItKSAXFL7wfetcLM41KL //uAdgO5iZ8WQbQj6svw0zmHlHtj1WrTf/lGjIE1hXXGW9kCbzXQ1VsNo2UuhKPA7f5oBE RKBeDNVGwui4DEuTfmS3BVvAkGMCc+lV1jwRKRYxmEWij/oEe8ohdzmrDm5j4cDiom32ZD /6RyhYSFlc9ZcKpmbvcalfEoQICYrx+1+UaZIMZFadSQgYKXft4xp/V9HWhJmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776123253; 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=mU5lyDrozgEwuclXJPAOoFeACYsRGClreBFstSY/gPU=; b=aSLxlBe3hguFXUPiigOWSmNn+B5fNW5CCMsaLFjpJq9RAWG5KtdwzN9UOqKsTiC1L+HQ+j YhQnsH+F3IXgup/M98hu+8EXRd/wBVQzZ00s13X8hTk7+5HDmCMAil3QaD4yEOppDmAAlD b8wpjQpncuvLjOc+1SZ8JATK/FgBBdC3AGItSJUZbPHn+LToXLjoBXkD5nRuTjTw1dT+OW tIwMbMofst2Qw1MGF17FMKvOA1bMSHeVpsPLryh+aa3EPdfHumpm963nGmAMJJ2GADWEnk 7XaRsf7P6ywd0EnEsXR2t/lLRFUsQ9J4emGlVRpxyG8WmW+Waub9gtG7PyrHyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvkJP25bDz9LF for ; Mon, 13 Apr 2026 23:34:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 326f6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 23:34:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2b954770ddd7 - main - nvme: Use passed in max_pages. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b954770ddd7a4246c2100373d86ef5316becd81 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 23:34:13 +0000 Message-Id: <69dd7d75.326f6.1090f913@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2b954770ddd7a4246c2100373d86ef5316becd81 commit 2b954770ddd7a4246c2100373d86ef5316becd81 Author: Warner Losh AuthorDate: 2026-04-13 23:30:24 +0000 Commit: Warner Losh CommitDate: 2026-04-13 23:33:13 +0000 nvme: Use passed in max_pages. Noticed by: jhb Sponsored by: Netflix --- sys/dev/nvme/nvme_ctrlr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 447a824df8be..753a8b380a75 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1364,7 +1364,7 @@ nvme_user_ioctl_req(vm_offset_t addr, size_t len, bool is_read, npages = nvme_page_count(addr, len); if (npages > atop(maxphys)) return (EINVAL); - if (npages > NVME_MAX_PAGES) + if (npages > max_pages) upages_us = malloc(npages * sizeof(vm_page_t), M_NVME, M_ZERO | M_WAITOK);