From nobody Sat Oct 31 18:58:54 2026 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 4jH6gy4ND2z6x60t for ; Sat, 31 Oct 2026 18:58:54 +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 4jH6gy3NBdz3Hxh for ; Sat, 31 Oct 2026 18:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793473134; 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=kkfwFUZgDkygs4fyKak/zAasAwHYiRLT1IlyZkuH+1A=; b=HmWc3XDoDnqKekYNFbvIc1hmZHr26yPPD6v51IOE+IVi3sSiyDq8qgdFFnzFVGS9/YU0GQ ZsPnnRqKGtR4qQVj1bZdAAlodAP0VVyJOUzIoLpq8gdsEidkLtouOw35WIvOoaAWVpcuSK clPCnaXtAqozZrtOCAEDbMuWoN/iw1hTXnIGpQhM/HYbpVK4LEd2pj8Bi2aYPjvvgGMxiw 5z8LZi9VLyP8Ci29cvw/c22KOwNWYL/gqSVo5NSbvnaB9kkyGoyUQNhXaffTdGAEkrqdu9 pFIh23LKfr8UecwqyaPioLDflsWGOvWkpypUochnB0jZYHxiqwcG5DKAHf9yhQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793473134; b=H1MFPGSGBTYwgfy31xzgG8X+m8UcpiOqQGBUK3pgq07aj2xyIwrN6BXk9nBSoTRo1wrwzA Pf06t+yYq4p5F0McHkJqmSdDe4Yzz+vnRzgVsNN8L7BHjPIT7WQ2FGBywCAHOoTFbOB1CN J+swj9hsqqvn8UjZ2X2drnCWUviwqbyVu99/xVxygEN7m88TavqoAbfyfITAOmcItPubnu xnobTrBp5dvVcW54tXdrTfRJL/DcduuzJTM35D1kDRP0GO/lSl0w7rVoue2C2ozAesq/qy qNeI+ORPAtPiSqQ8ZwVUqrSCDN0wM4bOUBt2l4omZG05c+8TdJl+3fXv9SKaWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793473134; 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=kkfwFUZgDkygs4fyKak/zAasAwHYiRLT1IlyZkuH+1A=; b=U0ZEd4rA07VJv405NwbFTcDMimsXJ6OC+NXu3rMTbXoMJRPj0zppOhFs+gsDfc864Z3K6x jOdjLo9iBXNZeghPzlI0ui8YdHX/buMkZI8OwdKGK6zyQst7wGwCYYbE2b403+YRnXwKHw UBf3JhGScSLMzANbH+aXuvAeLFCTlQBAQ/xarqVU7rwzdkaytcMcx5TrbS3ExdwP6+DZwF 3/M133MZJ8Sth0tyHoDucNUoDO+2qhZktFz/bYssi65fmJSKXgEfaDN5A3o2YFENn+SXrJ 9acfuRKvn8bL5WpBh6J81FwP995/8QvBJOLjsLK0a54jkMd3p4rUeR8LhUJDzg== 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 4jH6gy32TlzP4P for ; Sat, 31 Oct 2026 18:58:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24a43 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 18:58:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Avinash Duduskar From: Kevin Bowling Subject: git: 952ea69cf245 - stable/15 - netlink_snl: make snl_free() safe to call twice List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 952ea69cf245cd4843071026cda1732ac968d415 Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 18:58:54 +0000 Message-Id: <6ae63a6e.24a43.67040ad4@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=952ea69cf245cd4843071026cda1732ac968d415 commit 952ea69cf245cd4843071026cda1732ac968d415 Author: Avinash Duduskar AuthorDate: 2026-10-28 10:22:14 +0000 Commit: Kevin Bowling CommitDate: 2026-10-31 18:57:05 +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 (cherry picked from commit 489ded6d5231f44e02988e8c47969a9e6a1e07b7) --- 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 2d9798f1e95d..7e7d9fa19db5 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -240,13 +240,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; } }