From nobody Mon Apr 01 07:34:37 2024 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 4V7N7d6ZF0z5Fr0Y; Mon, 1 Apr 2024 07:34:37 +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 4V7N7d3W4vz4kPY; Mon, 1 Apr 2024 07:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711956877; 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=0qnN7/yuOH52MwvQFhwI+E7e2FZPUFfeAlI+JHm5Idk=; b=stdtJGpYQNCr3gz1w2llC4x3YTkOl/UDyE6ZRnjJtkV8G3v83vWQ88Lej0Q0ABFSRFaRcB 8IyVP+buAO4QpqBECVvjVWmR5oGVmNfumewCFr47XlBT0smFtJpkhmkScGj9npJY7PQf2V 7AvlhrmwVKj4AqRwIsQnq47YwOjVKERFv9Q665rcaE9PWQShsds04VAhE7uzMwyLoQ/PAY 1cF8X2LtYACqNQ8nl1m3lA8ILaHabAxVBcjbtQWANYpH/tdN4APGbO7FhwplEUD8bPpZXE LGNJt18rEZD0N3TtBirW276aaX67teA2DNPgDsMmRDG+0++v/nyUswu8TsFabQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711956877; a=rsa-sha256; cv=none; b=gMi4bd31GfX5JoP2zFASPx0wSUA4/stuv3i+dKozVolIovuCQTtjyvvQk221s0GYtr4bki JQhUv3m+5NlyjyMefltExF3PF0dy10Wqv8EI1TnqNoPsUdqqufPl77qv1gmWH+fteHOLXD jLFQ2+w75X/Aux7q+/Qe4nmVfeevtIX3JEsqRWzT08k6CA/jfTooCL7+T9MlcRe7Y6pBLc KlZNOrkj2/Y0LhLTQYAfawcHrLSoqIVAtw/wcSSeXEnz4hUu8dtM74WMqKmFZIeFxgPBa9 gpq8s26tn4Lj3nmDL9JByH75V1HF9bYK1g2DNuHCrEmGXoaJEPwYTZiMXQTctA== 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=1711956877; 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=0qnN7/yuOH52MwvQFhwI+E7e2FZPUFfeAlI+JHm5Idk=; b=sz6qnvwLg7A92c+tDFOFe3Wn7JuZ+wr3NPdUjVmxAejWQc/GtxT1x0DCa0xiOK9lp7BG2U ZWu1d+jpgoRTvMXeg+V6VkYvvYSYXIOX3vVhrUL9zsH3jAHPb77ykt19F+OOHRqkn8/CJK vXWV03MVdPMyoHRemTPWY4be8oeQg+5leP3VeAecjWC8KBfk63Og76lGjIL9vFV+KbDqHn aXZDc66+TMCJ6/Om/CUGYJ6QISVHb1/1JLyl2ritjkdrTyyi3KO2fWORDqnH8ewoYd+PvV fH8JJwCsalSn5ug934H6K7oYM1lSkvVsY3mm3sX3y40Chex4FkPCCqGHSwaCgQ== 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 4V7N7d36kkz1Byn; Mon, 1 Apr 2024 07:34:37 +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 4317YbnD037804; Mon, 1 Apr 2024 07:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4317Ybm5037801; Mon, 1 Apr 2024 07:34:37 GMT (envelope-from git) Date: Mon, 1 Apr 2024 07:34:37 GMT Message-Id: <202404010734.4317Ybm5037801@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: f5c0005567b4 - stable/14 - pfsync: fix use of invalidated stack variable 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: f5c0005567b4f029297ffc5b5c7c2925b2608ba1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5c0005567b4f029297ffc5b5c7c2925b2608ba1 commit f5c0005567b4f029297ffc5b5c7c2925b2608ba1 Author: Kristof Provost AuthorDate: 2024-03-24 08:46:31 +0000 Commit: Kristof Provost CommitDate: 2024-04-01 07:33:32 +0000 pfsync: fix use of invalidated stack variable Calls to pfsync_send_plus() pass pointers to stack variables. If pfsync_sendout() then fails it retains the pointer to these stack variables, accesing them later. Allocate a buffer and copy the data instead, so that we can retain the pointer safely. Reported by: CI KASAN, markj MFC after: 1 week (cherry picked from commit 81debbd60e5773e812e9227a2003ea88699580be) --- sys/netpfil/pf/if_pfsync.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 41eab7be515d..5df5824c93b8 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -474,6 +474,9 @@ pfsync_clone_destroy(struct ifnet *ifp) MPASS(TAILQ_EMPTY(&b->b_deferrals)); PFSYNC_BUCKET_UNLOCK(b); + free(b->b_plus, M_PFSYNC); + b->b_plus = NULL; + callout_drain(&b->b_tmo); } @@ -1766,6 +1769,7 @@ pfsync_drop(struct pfsync_softc *sc) } b->b_len = PFSYNC_MINPKT; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } } @@ -1906,6 +1910,7 @@ pfsync_sendout(int schedswi, int c) bcopy(b->b_plus, m->m_data + offset, b->b_pluslen); offset += b->b_pluslen; + free(b->b_plus, M_PFSYNC); b->b_plus = NULL; } @@ -2563,13 +2568,21 @@ pfsync_send_plus(void *plus, size_t pluslen) PFSYNC_BUCKET_LOCK(b); + MPASS(b->b_plus == NULL); + if (b->b_len + pluslen > sc->sc_ifp->if_mtu) pfsync_sendout(1, b->b_id); - b->b_plus = plus; + b->b_plus = malloc(pluslen, M_PFSYNC, M_NOWAIT); + if (b->b_plus == NULL) + goto out; + + memcpy(b->b_plus, plus, pluslen); b->b_len += (b->b_pluslen = pluslen); pfsync_sendout(1, b->b_id); + +out: PFSYNC_BUCKET_UNLOCK(b); }