From nobody Tue Jan 24 05:43:12 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 4P1G8w6VXKz3bNHY; Tue, 24 Jan 2023 05:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1G8w5n6yz4T4c; Tue, 24 Jan 2023 05:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538992; 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=AOMBbxkoD0V0cPv/qyAN0+7U0Bm1h2dlv7jFJ1iKvbo=; b=PfJRrqgYjCxANp+wENPC4mNa6AjOFOgLG2jQbv69+DhsHuF4LO8cevoxuOmgAWAn4Hezuv orCAng8u0dLMRYCfpc5xST10MnKXoniVKf8gPcYD1xRMp/uCN6Mqhnan5UVIbnEIFKnw18 X9/mxkP0sp8LkY4LTOkOSjmm897KVlkHm3AHk8XcPvpr8bO1UnYjMfWpoDHdKDiw2RqD3d mVGCIaOjCGnOF+8F3pCrx+B12CCxzRzBv5l7NI5iwvA8NpJjeMnQYKJ20Pv4WFSd6WUTfn /TCkxHcrXAm513U5wNlsrTA/Xf7PXpxBton0YOdBOBvMMMEB3BUYVVtBaCWeEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674538992; 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=AOMBbxkoD0V0cPv/qyAN0+7U0Bm1h2dlv7jFJ1iKvbo=; b=eknwEcCb4By81ekHOkInj1vjrG1pzgR2hzWssg1Vt9705Mh53to68Z8KAjoRO02r9Laoj7 chNLOcZ/cpN4GO3UZF0O07v8xpfjPtktC88c09s4ditF3k1VmV42MK6ZXAk/mnQNicwQ8x 6wrlWJ5RSALHvXIA2Kp3FSB9ESyxflj3jy1igREExVibeYg4/j+Pj+ojiiY72sFJCBJ7Uh yKr3EnHZ5LWp4uRKJjlSY+KNdOZ6K2RaP2CoVPaQ2T2uIGB5u3RFGH/0Oj8WkfYokyjPnF igYQk0h7aCr3WZgWO4NYGWOLRohUDHOAIBn8JN1XJmZ3TYu59YMgabiMV9/uJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674538992; a=rsa-sha256; cv=none; b=yIOg0gnuJQztPKioRVTF7Q3D76SPrQONbaih0oOHNoA/RgAhlUwdPRymhi4qxsHFWX6h8o mnrrIngMdoezv8s3ur68NamAKZhKXJPkpowjH31R3UTZbZ7R8EevBfgYXNhZQM+XdRwStj qHYP2dtswwytlaZ5H2tE2kzUachCJA80b46vV++ZP8j2CWtACvqQx9ZohhbfvOQAu6ni51 gRugaFLvXE/aX2SMA9YGil4XU1qO/KdJxm7wkFtFtP2Qk+p3Q0Ny/SAPKOgCx8V/ulxzx7 zF7/jBR+Qtb/M2DdzKEv9KfTQzYw1L+3SGXfdoSdshEHp09VPfJmVGhUmLPAkg== 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 4P1G8w4nWMzxw7; Tue, 24 Jan 2023 05:43:12 +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 30O5hCA6061761; Tue, 24 Jan 2023 05:43:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O5hCPB061760; Tue, 24 Jan 2023 05:43:12 GMT (envelope-from git) Date: Tue, 24 Jan 2023 05:43:12 GMT Message-Id: <202301240543.30O5hCPB061760@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: 4f1a2168f685 - stable/13 - ktls: Don't leak ktls session objects for certain errors. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4f1a2168f685cadd9e8720fc6220a7a686fba2d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4f1a2168f685cadd9e8720fc6220a7a686fba2d5 commit 4f1a2168f685cadd9e8720fc6220a7a686fba2d5 Author: John Baldwin AuthorDate: 2022-11-12 00:00:37 +0000 Commit: John Baldwin CommitDate: 2023-01-24 04:57:41 +0000 ktls: Don't leak ktls session objects for certain errors. ktls_cleanup() does not free ktls session objects, it merely cleans (and frees) members of the object. Change callers to use ktls_free() instead. Reviewed by: gallatin, markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D37352 (cherry picked from commit d01db2b83705eb3557a32ea13143997cdb8135a3) --- sys/kern/uipc_ktls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index f60d5e0948d0..e3f84171a976 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -682,7 +682,7 @@ ktls_create_session(struct socket *so, struct tls_enable *en, return (0); out: - ktls_cleanup(tls); + ktls_free(tls); return (error); } @@ -1099,7 +1099,7 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en) error = ktls_try_sw(so, tls, KTLS_RX); if (error) { - ktls_cleanup(tls); + ktls_free(tls); return (error); } @@ -1170,13 +1170,13 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en) error = ktls_try_sw(so, tls, KTLS_TX); if (error) { - ktls_cleanup(tls); + ktls_free(tls); return (error); } error = SOCK_IO_SEND_LOCK(so, SBL_WAIT); if (error) { - ktls_cleanup(tls); + ktls_free(tls); return (error); }