From nobody Fri Oct 30 14:08:05 2026 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 4jGNGs5FCwz6wwfq for ; Fri, 30 Oct 2026 14:08:05 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGNGs43RVz4qjs for ; Fri, 30 Oct 2026 14:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31Y8CbUW2EiwQicvQtMH1TeNKpHju3D1g6Nc7yJYUw4=; b=Ms+7nO57VPKRY1FJCTCCoR/yHvPfYefNGvDrPTjvK5ceU0TFtx98YhVXUQ7HD8NPMdKC0M eB0TvIpxXvXza/+Tt2seJM0dtR+Ip0igk7mI1/g5BfRVCRpXFQqDS6K53+tpL711yEWcLQ bYnBbpNn4UGOvDhkMUA3R36uveigdAPys70LziBakeZYSZe/IOYBCpjtJLQNRKi87HnIPH DLwJmHdshy9ZiolVQ+ds1+jTwui4G7jmb9XnX4XITiv23TyAPKtAMXRWBC8/XnmHLAz3vL v/OfSZ8l9+jmmNvUmrnJUmyDixzQJOyEtLm7dRDRWR+MqLbNha5HVKa6dAdIYw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793369285; b=cUuiTgNOgVM+PuN2KvGFAathIRl3XvkHZsfJkPIqRYF7i542X5eh3Y8AljCcNUBfeXCyfa 0OYSmOFxUL2Sj5E3kVAXubzsbrzSO0uRNOxpsb+apIEfT12zGpwmV1zmggmPJNQM7vuar8 VKKSDNyNU9xSiO2qVXT+bifrN8TVaPPdd2S+ToW83XmT8UwJt9sMW2ug36tAng7YCnHHbz 7668Ic2CtmssoT4Ekx8WvIaq/nTqwmdfPiClseLGmxXxOU0qNQDU58qZAzTtl/OijfYURp Sj/EAvwIbZmtEwfl+9T8+Kue/xIOTCECDOLkIcj9zYQVbznsqTpvZKUZDc/NnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793369285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=31Y8CbUW2EiwQicvQtMH1TeNKpHju3D1g6Nc7yJYUw4=; b=W0GBmAJbhli6ccWq133f/1L+pAJA8WHNCeLum8h+KtATUqP0XVIeSukxu509WNyKcsG7C2 XdPCsFoff2zIaujZ+LzOHTJDN+ZR9qWkul7cNKwdsDe6shUl+inf4LwufcFf5gOuNZOHCT HQdXA58hpIhI7jC9DCKX4UWrqs1HTzSTm+0VhYwGEpJyQSRVNMev7Aw3fer80BHy+4Ebq4 VmyiLHXgQMhskm4phFI6d5htZvfzQ0Pzlp2ZDW2yEUvt1rRYAclD8gRMnmcQp8kxwfnsOG uyYYqG8MoI/3XAc46eDOSS+SIPg70xWT20DbG+i5QkICSX6nAdT8PHL4e8/gdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jGNGs3SmWzV20 for ; Fri, 30 Oct 2026 14:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22dab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 14:08:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Avinash Duduskar From: Kristof Provost Subject: git: 489ded6d5231 - main - netlink_snl: make snl_free() safe to call twice List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 489ded6d5231f44e02988e8c47969a9e6a1e07b7 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 14:08:05 +0000 Message-Id: <6ae4a4c5.22dab.6516e6a4@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=489ded6d5231f44e02988e8c47969a9e6a1e07b7 commit 489ded6d5231f44e02988e8c47969a9e6a1e07b7 Author: Avinash Duduskar AuthorDate: 2026-10-28 10:22:14 +0000 Commit: Kristof Provost CommitDate: 2026-10-30 14:06:08 +0000 netlink_snl: make snl_free() safe to call twice snl_init() calls snl_free() on its own failure paths but leaves the state marked initialised and the buffer pointers set, so a caller that also frees the state on failure, as libpfctl's pfctl_open() does, closes the descriptor twice and, on the lb_init() failure path, frees the buffer twice. Reset what snl_free() releases so a second call is a no-op. Signed-off-by: Avinash Duduskar Reviewed by: kp Pull Request: https://github.com/freebsd/freebsd-src/pull/2508 --- sys/netlink/netlink_snl.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 7800e2c50f49..03c5a573da21 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -252,13 +252,19 @@ snl_clear_lb(struct snl_state *ss) static void snl_free(struct snl_state *ss) { - if (ss->init_done) + if (ss->init_done) { close(ss->fd); - if (ss->buf != NULL) + ss->fd = -1; + ss->init_done = false; + } + if (ss->buf != NULL) { free(ss->buf); + ss->buf = NULL; + } if (ss->lb != NULL) { snl_clear_lb(ss); lb_free(ss->lb); + ss->lb = NULL; } }