From nobody Mon Oct 9 00:58:55 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 4S3gdr0rBHz4wTdC; Mon, 9 Oct 2023 00:58: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 4S3gdr09vcz3Kw5; Mon, 9 Oct 2023 00:58:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696813136; 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=pSqBH/5CJu8oqMgCrMwi9yoGno3Z6CX75hgmLDz+iOE=; b=cX0LFUz3MXzttPF0eMMmZfkTPXf6Zgg3TrEYa/CgOwOmpaAGuqjuwhHnZx8ZC0h/MX6WKc nJpj5a/B5RJ5bU3NZIU/v3h+wTr7YRf147A7ka8otz3rLbulgsslxcR3Du0U6rzhjv4vbD LwhnGrnTY4kYHCtokGf5Wgrc0MyFe5iZXjKQmPeJYajbFaZIa87CKnUNVZzvymlpKiAUnj KHgZ0zacRLCvwag8ECqUxPHqllFqiXln9aoQ6WZ5PlhxJcGIWY0SpFQ21H2EDoggycWzBK /CE8JXEiqPKlKp61Yv2DWE+EO3qZf27VAuF+0zh/ZrLk7DzeXzLisioM4Ofn0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696813136; a=rsa-sha256; cv=none; b=yhpthQLve4bAKnQmMzhqahopAkmI4bdtVh/DxCMdZ/jor6jvxQrHSMObi+eCDMYUheu+a5 d1pefEcUiQEfdcvYFnVWV+47bdK/YaHHbsQQueo7hga4U/YWv5B5V/btwNdZP67m8xgjQz 2KxWVPl/rYrS3Y7Wq9a1EqcIunDN2a131p0T1rkcP671lJ8TxRtghJ6cUtUyVHVoCXO77n swOLClz4poLGbBQSO2VSuIOYo8Hhx3CTqGo7LIB3793w6D6ZG+Js4YaE0tCK07iZ9YKulB lH3urRE6nMerzachqRyi0emcqVC66igt95Qmh+r4YpiM1OeO31uhKq2hg8p3qA== 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=1696813136; 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=pSqBH/5CJu8oqMgCrMwi9yoGno3Z6CX75hgmLDz+iOE=; b=FSawLUwkfaiP1XoUv8poFTn/cZ/g8MM/pKrkrAdQgE/9DgaCdtHMQlOsOLaY5QfPbvDsL9 fVRpP8Q1ygSnRrrcrlchpdwKoikZtLMCd6NTZhJ0di3T2APMyuq58j9lMU8ekYa4Uzpfs5 2UxOIb7fSjRzmK7hvMKR0bH9sRQOIAaBg89DBwHcqfkTa6v0UnFlQGHHP7ERV/+yKok66z VG/Y9wG9Oa7ddrz7fw7cEMQlUxhbG0GpaFZUmkej4IU1ySFcd34iOX+AMPj7QGGbK67EAQ dG5atIrEcc62ArE09t4Y39khcKDx/MOBC5xV9CZj8fIwFYEuHrJ/QQh/EHzTJg== 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 4S3gdq63KgzbZY; Mon, 9 Oct 2023 00:58:55 +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 3990wtnF040262; Mon, 9 Oct 2023 00:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3990wta5040259; Mon, 9 Oct 2023 00:58:55 GMT (envelope-from git) Date: Mon, 9 Oct 2023 00:58:55 GMT Message-Id: <202310090058.3990wta5040259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d08ef6f7da39 - stable/14 - netdump: Check the return value of ifunit_ref() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d08ef6f7da3943dc49999988e6c2ac03644bdaf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d08ef6f7da3943dc49999988e6c2ac03644bdaf1 commit d08ef6f7da3943dc49999988e6c2ac03644bdaf1 Author: Mark Johnston AuthorDate: 2023-10-02 12:08:20 +0000 Commit: Mark Johnston CommitDate: 2023-10-09 00:41:42 +0000 netdump: Check the return value of ifunit_ref() We may fail to match if the specific interface doesn't exist or was renamed. PR: 273715 Reported by: grembo MFC after: 1 week (cherry picked from commit d94d07d58141dcff48f01c6b3e5a31de9d7a7938) --- sys/netinet/netdump/netdump_client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/netdump/netdump_client.c b/sys/netinet/netdump/netdump_client.c index 35167f690ed2..0f0cf4dbb79f 100644 --- a/sys/netinet/netdump/netdump_client.c +++ b/sys/netinet/netdump/netdump_client.c @@ -451,6 +451,8 @@ netdump_configure(struct diocskerneldump_arg *conf, struct thread *td) CURVNET_SET(vnet0); ifp = ifunit_ref(conf->kda_iface); CURVNET_RESTORE(); + if (ifp == NULL) + return (ENODEV); if (!DEBUGNET_SUPPORTED_NIC(ifp)) { if_rele(ifp); return (ENODEV);