From nobody Mon Oct 16 07:16:34 2023 X-Original-To: dev-commits-src-branches@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 4S87hM3ZjSz4x0tf; Mon, 16 Oct 2023 07:16:35 +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 4S87hL74MCz4V0f; Mon, 16 Oct 2023 07:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697440595; 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=gFnt1QCHRPPvcsqsmwPMguEyUiFJgmaF9hvva9cSv30=; b=bcjEFkQB4l+ShN8P3r0UbybXI10ormQcxN+1MIcdKgbBGBIUlCFxKcl//WXCLny3VTWWeS X7YjoXiqy6R/pU2zDBjiWlQyK0NX+WDfoe224VhrC8im5v5ZDUsTHSlq2SkMiVmx75pPKP uluRoBTt8tcbeK7RC74d8SGNScRE0Krh0RB6GI8OqEJXrrOPEZbHngfa4JtTg/Ln7oWaf3 NtwAMn7htMSuRY7PUC4bH38ogORVA8JQEcLanpLLd9nl33panUSTQo7bL6OOcROVnOb0ND tEk8qSwLZvcO5YMwHCjOO9NjsvNkijU8VctouISlZAvn2Ta8VD4lsWWAWa/vqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697440595; a=rsa-sha256; cv=none; b=VDTHP2S/K0rbHkkIL0M9uQrJ9sgYQZz5zhnrz9JfaOL32fcyXc9KVNTnrzUU/nmsBULeRe wZe86bUwhyLIHc5ehCSk1hySTJ4PgWdDNKt9jV3k39CgUNndfsjg3FypcP1Ak5kNkJr2ir /bPt8C/4QsqukhGkdFaAzR9JxrSTH5nxtf65cxhWySQ1NU/KysPkh1DssKjJ5KDRUIzmBG 9asaixzJArZqSyJwVHajYt+hJKmLYDw3W2TmdBuXsZCW/ZIg2eG5kNVTiysi8Y58tRNq2R DLo8KLI0KtgDLuTM67fVnI2o3cnxqjUBDEl9SSOxp9fSgCOqSsj2xP/oc2qBbw== 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=1697440595; 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=gFnt1QCHRPPvcsqsmwPMguEyUiFJgmaF9hvva9cSv30=; b=HzsczeGIijOEnnVaxy0saoG9CqQaNRCwlw1PYda0/XljZcVQL4o/Wgku7YT+rmHAaUbvx7 AReSrlcYYVicrxlaq/lV1Cw529BsSNKEFCE+HmXjM9+3qW/HZy6HdZUttItcAW0hkbgbzy XIyITgHDveBHXQedHUPkHDzG80e0yUSmg0cPACqH3ASoAS8vmNgjSsBSebIcZwsMzHIzQd 826Bicoe8vx2C1Qm+rYeHiUlm2eBK8FYeKlUi6VvcBqqsFF80v+gyndesszQ86A4qu8/Sa jqLy4ELoCqvyU6NdCyE3U+ZnTvdSkH4do5zoBP6vMNEGRFXyy89T0zg13NiN3A== 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 4S87hL67b0zX2l; Mon, 16 Oct 2023 07:16:34 +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 39G7GYFc054773; Mon, 16 Oct 2023 07:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39G7GYrK054770; Mon, 16 Oct 2023 07:16:34 GMT (envelope-from git) Date: Mon, 16 Oct 2023 07:16:34 GMT Message-Id: <202310160716.39G7GYrK054770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5230afce76a2 - stable/14 - tun/tap: correct ref count on cloned cdevs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5230afce76a2de387cc162384ffef4cebf576e97 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5230afce76a2de387cc162384ffef4cebf576e97 commit 5230afce76a2de387cc162384ffef4cebf576e97 Author: Konstantin Belousov AuthorDate: 2023-09-21 10:47:14 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-16 07:16:01 +0000 tun/tap: correct ref count on cloned cdevs PR: 273418 (cherry picked from commit 27f1ec0be24b45559793e486a4fa5a2e7fdadc17) --- sys/net/if_tuntap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c index f4dbf685fba6..a01bc11aa64c 100644 --- a/sys/net/if_tuntap.c +++ b/sys/net/if_tuntap.c @@ -548,6 +548,7 @@ tun_clone_create(struct if_clone *ifc, char *name, size_t len, if (i != 0) i = tun_create_device(drv, unit, NULL, &dev, name); if (i == 0) { + dev_ref(dev); tuncreate(dev); struct tuntap_softc *tp = dev->si_drv1; *ifpp = tp->tun_ifp; @@ -611,8 +612,10 @@ tunclone(void *arg, struct ucred *cred, char *name, int namelen, i = tun_create_device(drv, u, cred, dev, name); } - if (i == 0) + if (i == 0) { + dev_ref(*dev); if_clone_create(name, namelen, NULL); + } out: CURVNET_RESTORE(); }