From nobody Sat Jan 22 13:48:56 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 D4B68195ACB6; Sat, 22 Jan 2022 13:48:56 +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 4JgyJm5Zltz4rLv; Sat, 22 Jan 2022 13:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642859336; 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=lkyl+BNOHFPK/2VY1y0jWENrsD5BAGYvmTrFs+V1VVQ=; b=q2HUGve6OSFT7ZN06PgH8Q5HGslzj3MGNSxser6BbKdWUfZHsRXp/GFNEhklUrj5T1Hphl HJuvrbu+abx5cIqXmREPrKKxHt+Hb4F3cs0LYqg0I5FfWG1fA69UrGDYZBwUH/CQ5FFNZe cXOjSFMk/QsyLtaz6bZNY6EMAJlUZCDgBRVx78NkigbBRWr0uTK7LU/No9N+SWzAiwSQAa fuu5VXqchTa9ZcmSgCqb7SQfnN0/YrNEcZ4p5S6SZRaq1ZjceJkAslYfW5yxTyLfOaFhDP FtzWpWwSbJXAT4o2SuJcC3qRcK8+mSp4AMD3KEz77hqpN5DwefkZ9Mr0E0YS4w== 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 9EF1A10367; Sat, 22 Jan 2022 13:48:56 +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 20MDmu7k033081; Sat, 22 Jan 2022 13:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MDmusP033080; Sat, 22 Jan 2022 13:48:56 GMT (envelope-from git) Date: Sat, 22 Jan 2022 13:48:56 GMT Message-Id: <202201221348.20MDmusP033080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 0daa28057c6c - main - ip_mroute: add unlock in early-exit 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: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0daa28057c6c323f8def0a1c78fadb789b63fd27 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642859336; 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=lkyl+BNOHFPK/2VY1y0jWENrsD5BAGYvmTrFs+V1VVQ=; b=B3hZv/f9CGxjif8cuG27MmfEjp5teJup3MT9evHlVOsM8vz7virXHO15fBBojF1nux/NO5 wDlTjVdFqEDlaf7AxYX2GUvdeaGnztA4QMbr32QVIbwx+RxBio2XMzCsTlEHyeSXFb8Gwu 4+ngiqL64lEY+3EG/Ohj0JsVcBYoVp/dv1EqpOYxd6RcPL6EUoapxB5DKs1Co9siIqhxu3 2G4MW1F07wl3X+KlnV0/iHzxI4FCd5Sq/y32c7V+7xhzmMVGZFaEtW7Cfn5r+bxDh7HM5E dl9uuDCsH1UlUmV2IK2Bngc/CbKshCJTagsvTQFWh7t8g4fnDeysbElkjX23qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642859336; a=rsa-sha256; cv=none; b=ya20/U6axNKaEBp9/2IrKHLFHGAOaE7I0UNe9OYI9UbpAAQmv56vyNoaacuxB17STO7vD5 H9UpBZBvWdts0laQ1eIFKfBipHnV9acbRIHQj8O8q7k9UjkkU1xO7sK/C5aZgsh301ippA ISmQvgOMw0GZz61NRGOHMNQexj7yDP6erlftVPrHNm9m9raBiRx6eGRKDMEH7e+OI/zLIS uWm9sQPftkCD80ySmGTpZD9g1wz4ARV8n0052euCxJUadrWHgVC/nZimUFh/LqP6noPucq Ws5LqKQSFHhLHWRlqDarLPTBXQg75xj6u4ERt/5EwCOWfZg5LYy/cHO5pMZyqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=0daa28057c6c323f8def0a1c78fadb789b63fd27 commit 0daa28057c6c323f8def0a1c78fadb789b63fd27 Author: Wojciech Macek AuthorDate: 2022-01-22 13:47:47 +0000 Commit: Wojciech Macek CommitDate: 2022-01-22 13:48:47 +0000 ip_mroute: add unlock in early-exit Add missing unlock if V_ip_mrotue is not set Obtained from: Semihalf --- sys/netinet/ip_mroute.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 0566048621ad..fdca39b5dbb9 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -741,8 +741,13 @@ X_ip_mrouter_done(void *locked) vifi_t vifi; struct bw_upcall *bu; - if (V_ip_mrouter == NULL) + if (V_ip_mrouter == NULL) { + if (locked) { + struct epoch_tracker *mrouter_et = locked; + MROUTER_RUNLOCK_PARAM(mrouter_et); + } return EINVAL; + } /* * Detach/disable hooks to the reset of the system.