From nobody Mon Sep 25 12:27:00 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 4RvMZD50Y1z4rGwH; Mon, 25 Sep 2023 12:27:00 +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 4RvMZD4WVDz4Dcf; Mon, 25 Sep 2023 12:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695644820; 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=gCIuahURrEKqWykTbvP+Nnw+xQPSt5i/0E3oyCSjAzk=; b=AYndginWAKVj2cciAyyj2/F1u9BpVGYZ0oFvUc69475FDL4F81FuVdwYuEev/SHEs3w0Fc HYPSWq2t1AAlrZ9u48p904jIRkU3NHE0N1kZ9OQfWrhDCI0CVeX6BFVQufmk0GiJb2NOtY eTlJNuVGZ2kt6rn8fKXoaEBCQhXNbMkGJj9XLLxGEIYkLV/mz50MEV46Qtnwnp6ePfUr5x Y2HLNilephz/iDcip1htB3RXcgkB8jbsdczP833OzLC95vZYR1cOTILvLDZtWO1NaEBPtZ 69A19dwHHRD/qsjoXL0vVH2zwBOjtUpuiYKrzlxHRAFqLl4PLHPHuX/v+C0aOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695644820; a=rsa-sha256; cv=none; b=hr84eKPCjhA5Y5cZ2gJqagcgwuqntNjZgprFd5vq+zCYC5q7sSZEJK17Kb2CNl3gHQNRkN 4B9DO0O0RHV0/GT82lARZ9yvd7SIGXNmfzLtTeLvDJjBko7yiArRxciIPGa3MpJoO/d1nK q8qwvif/8vjtCExxwNA7dAFDlAxueLHjV2OwFmwtt/07KoCEVv9ZlElSQRakve/rYAwfwP iesmrNrs5pUwIJukRfKtFqViaMKbzcV4yM52DIpMnBxe+NQBBxTR04adatxWJ/cz6nHEv8 aXwgRH3Z/O00Fcv8n5f3qhC/3inRNIg3+9853XMlZQEzz6WohxadfbcfY5JTAA== 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=1695644820; 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=gCIuahURrEKqWykTbvP+Nnw+xQPSt5i/0E3oyCSjAzk=; b=oYxISg5u4AAG4omWX+ILysd3EmwSDi2m14g9Dl1yzfH7ezFbvY5s7E/zAFC83Ygvp4wA84 ntx8OrayylO6gfkKWZkjz0X1YlepXu5kljd6QnxdyZ1fRAQIyey/gpg19a9GL+iPQY9/sh K4tyH+qHH07Rmsy1FbBAZuOcW95o7X6aYUdL7L015JLvhJLVt3svEOtGqeMWNybsuwAO17 lzFp2AfcgTvuBbcnv0bN0Pd2/OJpCmu8aRpsaUrfIR+s0udhde0pp7PUgGU48k1oM9X1gQ QfXyyhHIex3k2Y1nE5nUkixN72XWAEFAkzpcqAONQWDae3oGk7XHekMFBmW/gQ== 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 4RvMZD3Snwz1S7M; Mon, 25 Sep 2023 12:27:00 +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 38PCR0fC094538; Mon, 25 Sep 2023 12:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PCR0UK094535; Mon, 25 Sep 2023 12:27:00 GMT (envelope-from git) Date: Mon, 25 Sep 2023 12:27:00 GMT Message-Id: <202309251227.38PCR0UK094535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: ed82385135cc - stable/14 - pf: fix state leak 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ed82385135cca73ab0416600269ace3e5bb4cd6c Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ed82385135cca73ab0416600269ace3e5bb4cd6c commit ed82385135cca73ab0416600269ace3e5bb4cd6c Author: Kristof Provost AuthorDate: 2023-09-06 07:58:07 +0000 Commit: Kristof Provost CommitDate: 2023-09-25 12:10:59 +0000 pf: fix state leak If we hit the csfailed case in pf_create_state() we may have allocated a state, so we must also free it. While here reduce the amount of duplicated cleanup code. MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41772 (cherry picked from commit b6ce41118bb11d3db86eae8fbebc8c198e8b330d) --- sys/netpfil/pf/pf.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a5d7c1ba0155..7cee0833072b 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4881,13 +4881,8 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (r->rt) { /* pf_map_addr increases the reason counters */ if ((reason = pf_map_addr(pd->af, r, pd->src, &s->rt_addr, - &s->rt_kif, NULL, &sn)) != 0) { - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); + &s->rt_kif, NULL, &sn)) != 0) goto csfailed; - } s->rt = r->rt; } @@ -4946,11 +4941,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, (pd->dir == PF_IN) ? sk : nk, (pd->dir == PF_IN) ? nk : sk, s)) { REASON_SET(&reason, PFRES_STATEINS); - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); - return (PF_DROP); + goto drop; } else *sm = s; @@ -5019,6 +5010,14 @@ csfailed: PF_SRC_NODE_UNLOCK(nsn); } +drop: + if (s != NULL) { + pf_src_tree_remove_state(s); + s->timeout = PFTM_UNLINKED; + STATE_DEC_COUNTERS(s); + pf_free_state(s); + } + return (PF_DROP); }