From nobody Tue Jul 12 12:48:28 2022 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 4F1E317FE275; Tue, 12 Jul 2022 12:48:29 +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 4Lj0t51kftz3tS4; Tue, 12 Jul 2022 12:48:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657630109; 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=nPOauDZSJeld/UPzB/avKOnwG0vo9eaVHMh+pNMf21E=; b=b+N1HyyvnbYuAMRuxUa3QJ5t/MC0FIGhQ6+HhlPM1dSAsovNsaQP7akmqzWJvlAM7Y8KST rAHltlvk9Gs38nGnUPErZKyphw5pxjIFcN5bEUdNgBtlcuNP/V2Bi6LEJhLyH4qomztmlE vSE/MCl63ZGhd0atx8sNQGVsZ6kCEWcUpyovILUIsYHaAPquk+DbRYuTUYJNYRULC4bY7j q/alWGE0/WTOY0+2U1rlWM5QvSYMfAgmMVuyJzmWW9VH35ELMZUCWsoBs5UI5iEE1mG3Rd MEXLTMCp+3yj/MsTzZeVJIX+/o4QuHOOK7BUuO4etHWr7LxWD31EwDaGHODhQA== 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 4Lj0t50hpRzkkZ; Tue, 12 Jul 2022 12:48:29 +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 26CCmS9W073473; Tue, 12 Jul 2022 12:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CCmSXQ073472; Tue, 12 Jul 2022 12:48:28 GMT (envelope-from git) Date: Tue, 12 Jul 2022 12:48:28 GMT Message-Id: <202207121248.26CCmSXQ073472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 59219dde9a7b - main - if_ovpn: fix mbuf 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/main X-Git-Reftype: branch X-Git-Commit: 59219dde9a7b5e33cb95e55d4621bd50b3dca37b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657630109; 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=nPOauDZSJeld/UPzB/avKOnwG0vo9eaVHMh+pNMf21E=; b=c1cYRpg3qv+8TW4AJSsuhKMuVuCrLFvoW+Q6pBS5VQKRAXvplRn4ddOoVCg/+y3JXED3G+ 7yUEzSG2sn7m++RLLaIZsAfUrhqmDbuFzA0G2rrP/Yjm5nrVptb1yB/pHB8vGBEgV9UdsN sk227rgMrA5cXmHgQqtX3KXPl+ctlTEqg5CbvQo7gJWCEPSquLoawBpYBeNEDYtByNZ6kc nuVxLFUoO7PBE0zUp3RPYJGx9Q0Tur3mAZQPFxxygxsdaZDqLQ92bfMySdlgM/DURR7m5m 0LpKlbjGvtMjGFwRDzyYhEwXAWa8BxptQOQxYBCpSRAr26NEYWTrYvxQM9MLtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657630109; a=rsa-sha256; cv=none; b=kw9lSCTqUo/dUValnAEL2j8VwRtJbvTUU8eMqmPMY0fTNwtJd3wMEUmTbfOlvpTLuF33Qj MZrSgpWxebPazwpFiZyFTuv+FIVjXvzGuA7C1DjKrkMQ/V3X5Yrj3s9FOBBJawLGmfI5VY iKcM3bLQJB0sjSCn80mzTqHSai4YgYELeJzNIZxsHwjEKTdrXNbAqq9kdMYElFwjoiGy/C CkS7TASw9qQZhe5y7p9CmEXeIDq3VyGErR82876wR82GZf/hfdfPp+sZkA288xe/TdVKR4 jsmdpHOWk6ry8VB8HBQGlg6tTGahj4IvqCqojKa//FYSHz2sg+gZuED4Sm14KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=59219dde9a7b5e33cb95e55d4621bd50b3dca37b commit 59219dde9a7b5e33cb95e55d4621bd50b3dca37b Author: Kristof Provost AuthorDate: 2022-07-12 12:19:25 +0000 Commit: Kristof Provost CommitDate: 2022-07-12 12:19:25 +0000 if_ovpn: fix mbuf leak If the link is down or we can't find a peer we do not transmit the packet, but also don't fee it. Remember to m_freem() mbufs we can't transmit. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 779d51075e3d..0f700a9b43d0 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -1988,6 +1988,7 @@ ovpn_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, if (__predict_false(ifp->if_link_state != LINK_STATE_UP)) { OVPN_COUNTER_ADD(sc, lost_data_pkts_out, 1); OVPN_RUNLOCK(sc); + m_freem(m); return (ENETDOWN); } @@ -2005,6 +2006,7 @@ ovpn_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, /* No destination. */ OVPN_COUNTER_ADD(sc, lost_data_pkts_out, 1); OVPN_RUNLOCK(sc); + m_freem(m); return (ENETDOWN); }