From nobody Sat Jan 22 10:49:06 2022 X-Original-To: dev-commits-src-main@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 47B6A195C6D3; Sat, 22 Jan 2022 10:49:07 +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 4JgtKH1QXpz4kkN; Sat, 22 Jan 2022 10:49:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642848547; 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=quCx2KAbNpMkVV44KnbW1Lt4YsqbwgHDTwDbRG9RzZs=; b=Gfx0l8/1XPJmODOMIGsdMquCaMwkgzCNseNZcSl6696YeAyB21HDuqabAHCImyZWGvc2MC iFN8OcZxbRQKt3iXrjl+PyAxg3jl7u9bpo7JbJSDBXCEUzH7gB1w6K6nGMMdhUi9QOspEa BxglBiXhtww24lHjPgyJdqQXtKfqHojlgODIopkhs+8zAAfeER+BbKy3gDLyarEUrm/bW9 bUubyI0CzxR8EJpiRWzNpVp685ZJYvamHNGA59ybLofg1JWs+LITQmmS9W7sMhUQiIAm9s iV3NwKPn/e59PojLOpmtqqjp2Q3Q7tJ3b159dFlgGLd5S4x1cRC6J4j1z8Z3eQ== 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 117435EBD; Sat, 22 Jan 2022 10:49:07 +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 20MAn6E8093232; Sat, 22 Jan 2022 10:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MAn6Qn093231; Sat, 22 Jan 2022 10:49:06 GMT (envelope-from git) Date: Sat, 22 Jan 2022 10:49:06 GMT Message-Id: <202201221049.20MAn6Qn093231@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: 889c60500d30 - main - ip_mroute: release epoch lock if mrouter is not configured List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 889c60500d30c8fd3cbf597fd73d5cd90f5fc7e7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642848547; 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=quCx2KAbNpMkVV44KnbW1Lt4YsqbwgHDTwDbRG9RzZs=; b=rGMEUXlINrVLL8tQAiTdCI1ZztCke9ITY48C97HhyiG6bZkHJsiavOfWM1zpOczsfKfeIf amHkygK4/9qDltU3ZIc1SNZ4HWfmL2cSo/GL2Vq0whu3+RIkmsTObGMF00rCIw3t8I8HgB wNKMq4Srd2gIvWLRIBNDkP8OS9Z2UWLF8aAy+KFBVwmgUkCnIsOIo1a04jIhorxCEwtmtz aXvB0VviYky/zBhJ+YVPyqxPfHEZl23LV/MpyXjRu+9YWW4LiRFaUH4P8hAqxg5bgLHCiV wNwkx9FGsa/t4BYMIOYoVmzO4vKFhyCf76LFztSyxStGNACyVMcing/kYFGjbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642848547; a=rsa-sha256; cv=none; b=SFzGk9WMJc75vr4D064su24j+QlbR21Q2U/8tbp0QP+vvCZ6MKbzRf0ZJ69Ld6O+J1QGrg njIPk/VvBHpXT8i93Fp5fRuL/nvGHno0sJTBzmYbpiHE8VQFP4oqOwR1Ze6evKuJLZOyfn G7agPjGpTaAyblocfEw2VB4ywNFtQ8l27Rlv7s4kHk9xbMwE8/irjmofSzGcROmvc50KxG PUIRAC60dDVA9To7FOWFAuyJJskl/3BLIxu+RqMuSMyZHD2nWK2vqQ3LHUgfMp+BYzxeDZ RL6u0D+c8FpmRua3vv3DKo/M5Q6LwpLhC7EyvkO/obkWpzulRqyaK0A3/ezS5A== 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=889c60500d30c8fd3cbf597fd73d5cd90f5fc7e7 commit 889c60500d30c8fd3cbf597fd73d5cd90f5fc7e7 Author: Wojciech Macek AuthorDate: 2022-01-22 10:47:39 +0000 Commit: Wojciech Macek CommitDate: 2022-01-22 10:48:30 +0000 ip_mroute: release epoch lock if mrouter is not configured Add mising "else" branch to release a lock if mrouter is not configured. Obtained from: Semihalf Sponsored by: Stormshield --- sys/netinet/raw_ip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 08ce848a63f7..229716918875 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -890,6 +890,8 @@ rip_detach(struct socket *so) MROUTER_RLOCK(); if (so == V_ip_mrouter && ip_mrouter_done) ip_mrouter_done(MROUTER_RLOCK_PARAM_PTR); + else + MROUTER_RUNLOCK(); INP_WLOCK(inp); INP_HASH_WLOCK(&V_ripcbinfo);