From nobody Mon Oct 9 00:59:01 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 4S3gdx5C2kz4wTnr; Mon, 9 Oct 2023 00:59:01 +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 4S3gdx4jtxz3Lbm; Mon, 9 Oct 2023 00:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696813141; 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=YqHUnl7r+bc+9/XjS4GCEt3xv2ik2RcRx41DJLd4tUY=; b=iFJJMuqdi/5KTAd+sqfyRYBVWNYnBBi+yuGx+p8QAV/c64nKMJckO79wVOWSjNCzN72kcQ 80OUgH+VsRTYjrom+/q5+6xaVbqr0uXj0Bk/WvqVJnDPe92WPVVyrXRgJ8DPrf6lbndoIb 8BMK+thfJIG1hyB35Yop1UFfujRiEu5Ei9FEkJx6/FvSt90JlK+etyu+u+f3KUx0Wmz9wW METg3xyXUy38KEr2AEmC3+SHbwTc1lbeSd1UyZnsWF1QJrv7Lqu6/I/HhjIODfc18SWycs ybWjhAccytKSmpbbRz1ysU+984ZdERh5TP/75Jsaj7IF0eeAGox5ptY65Q7Rgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696813141; a=rsa-sha256; cv=none; b=UldgPkFnq1DAi0YfxW/KMzGhik4WCOxn+ZkCypZXp+LWof1AlIkZQM0/yXPJaygo2k7sQ1 Z6upOPJY1LrUOXxk6lxbcZ2gLk/2HTrAlUwHfKm9v5v7O1NKG6EgJ8gBKfKbqCCfGM12tx Mae5c4w59I8yAz7spNdCaLTgdRPhceoWZt5jd4SNopy9Xt9i8k2XGhIQEZBDVDIeYDABt5 9+2IdqDuAi5pvHElfmkAJdMluY5R18JaGZt7xh1dArLnRleifS8BlFya0eAIlCg+yQ9vKW oyfSjW1ALN+7eLvOF+LMUzgSCzjZg+3T/RVHdr1RaZJeuHifXZyVBhmKn4w9Dg== 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=1696813141; 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=YqHUnl7r+bc+9/XjS4GCEt3xv2ik2RcRx41DJLd4tUY=; b=jcB6cHuZHH06R81MJ+aAZDzgWd/ymk8VL6oHYw0A3oXdUFDcuIEFN9cLbQisTieO1E4Rxl MsYJ/gqwnadnUePNvaV7KQ5np9l0CQpZucGAnnvzuyvEm8049tWKtonM50OreuOFOFGfqr sDHY8NH0HcY3pcIKQNx77GkAad7Kt98eB6Amj4O0K4IWAL5AjlD5Mlc7iVsgsWc9aPqHVJ u+cH4UxorH4gcaEZPixDVlczZHatvwYC4DxpC8CdbcprWtYY3jwXo7jMQmWfXPy7LMCtXX NM1wnaOrrrmBtEY9RvoonzwhQLM15j6Fcw649hAA6EHV+JsvgDYzy6CeJv/Vcw== 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 4S3gdx3q0hzbTc; Mon, 9 Oct 2023 00:59:01 +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 3990x1ET040459; Mon, 9 Oct 2023 00:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3990x1Fn040456; Mon, 9 Oct 2023 00:59:01 GMT (envelope-from git) Date: Mon, 9 Oct 2023 00:59:01 GMT Message-Id: <202310090059.3990x1Fn040456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 242a062841e7 - stable/13 - nvme: Fix memory leak in pt ioctl commands 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 242a062841e7166d8354470835dc1d94773b5c01 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=242a062841e7166d8354470835dc1d94773b5c01 commit 242a062841e7166d8354470835dc1d94773b5c01 Author: David Sloan AuthorDate: 2023-09-07 16:22:21 +0000 Commit: Mark Johnston CommitDate: 2023-10-09 00:41:52 +0000 nvme: Fix memory leak in pt ioctl commands When running nvme passthrough commands through the ioctl interface memory is mapped with vmapbuf() but not unmapped. This results in leaked memory whenever a process executes an nvme passthrough command with a data buffer. This can be replicated with a simple c function (error checks skipped for brevity): void leak_memory(int nvme_ns_fd, uint16_t nblocks) { struct nvme_pt_command pt = { .cmd = { .opc = NVME_OPC_READ, .cdw12 = nblocks - 1, }, .len = nblocks * 512, // Assumes devices with 512 byte lba .is_read = 1, // Reads and writes should both trigger leak } void *buf; posix_memalign(&buf, nblocks * 512); pt.buf = buf; ioctl(nvme_ns_fd, NVME_PASSTHROUGH_COMMAND, &pt); free(buf); } Signed-off-by: David Sloan PR: 273626 Reviewed by: imp, markj MFC after: 1 week (cherry picked from commit 7ea866eb14f8ec869a525442c03228b6701e1dab) --- sys/dev/nvme/nvme_ctrlr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ae1aea18adb6..84aa402af4f8 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1319,8 +1319,9 @@ nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, mtx_sleep(pt, mtx, PRIBIO, "nvme_pt", 0); mtx_unlock(mtx); -err: if (buf != NULL) { + vunmapbuf(buf); +err: uma_zfree(pbuf_zone, buf); PRELE(curproc); }