From nobody Thu Mar 31 20:00:05 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 1B73B1A51758; Thu, 31 Mar 2022 20:00:06 +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 4KTvKf01Twz3sg7; Thu, 31 Mar 2022 20:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648756806; 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=mjTWhlnbbcnaWwO8jorprvkFpbmC12IAFO3L5KBHZJ4=; b=xN8IYgjjl/iM1liD0hQEDeiDwVy42JvlZlZK1JHv+s8Y/YRdzPfl8DKDFylsHPWDRTNEbt ABYNUuRqtSZqwfuNrwjoDiwIYU43MgiNfRVO1sqxilIGa6FnKHbNA0UtMnyHS470EJrFNC +IlwvdWk/Yi8QJRIJ/aSVb95lfwE7vBPNGKgRdJyy8DXJIZw+fIpNxqX/2ALvpn/XpU8TX 1d11iYupySp1B8TohZKUMEybiWROIwijbkWtDrY/3g5SIkBf9Q+flTx5Mxb35r8m6v9lYU RTD8w3Nx+9i5neCHkjscZPfe7e/GJKU/fuw89HrjAO1rDpx+wlrRhI6wQYAQQA== 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 D4D312E081; Thu, 31 Mar 2022 20:00:05 +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 22VK05GN010447; Thu, 31 Mar 2022 20:00:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VK05lx010444; Thu, 31 Mar 2022 20:00:05 GMT (envelope-from git) Date: Thu, 31 Mar 2022 20:00:05 GMT Message-Id: <202203312000.22VK05lx010444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2108cc72906f - main - stge: fix null pointer dereference 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2108cc72906f274f30306570268434c4f8d23636 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648756806; 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=mjTWhlnbbcnaWwO8jorprvkFpbmC12IAFO3L5KBHZJ4=; b=SUJzv7XIeMXjzjNnEIb0q46TPFX+c2VAnd/FKbTPyivnPp7mOuCmwAYaDx7LxtBJriqBng UKhyeBN4JFjzBcA6JcOzEf6yOoK1jl9yiCccHPLzZfOmYDc1W/5IAZFELeasQv+a5v2T1s A7IyfeSl6abnazOh9twL3SVijGyq1xNjLNamhQeMiIGxMsfTK2ZKMmRAjBc3XQtTZYasj5 whOUVZYDAEk7sRzbSj2dgXZ0/3F3cUdYnfqmbtIusN2vD256UDRyHU+PDKMzlAkIhq7JI1 UenPd2iAXoJHjfbnZaWIMOus0vCnlxj2wk2FXL1O2Q+fdflEC+4lnPeqmxWIhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648756806; a=rsa-sha256; cv=none; b=gnZYfFRah5LeA2poMe6x3ffZsSHXXyzu52DsJ78hnCfnzlW13toDmT77wT5r/QaCHpZdyE ngqFS7a1TUEIbukAi5Ae/qhdro4+glIe47x/9hrB06BCNq90rA4nx+T988GoHTowToaugH iSweHguPEE/pOI3rRVmDXJTqQ/+ww6m+3BgEveJSb1jvf48uQPRFVKaV3HdBYP/kD5i4wI ekhVGsHcCLQzDFm+qC45SuGs/iLMqIuAx6LczTVfpPFD92ROGPQGaFjAOY1aKnC0y9fkhn ifmGJdfH6Y9RyPCRZKf3nEuX7QnH6tnPah/0X/rbXWuc/lHS4Zp8cXEYqUxO0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2108cc72906f274f30306570268434c4f8d23636 commit 2108cc72906f274f30306570268434c4f8d23636 Author: Tong Zhang AuthorDate: 2022-03-31 18:16:55 +0000 Commit: Mark Johnston CommitDate: 2022-03-31 19:54:56 +0000 stge: fix null pointer dereference stge_attach() could fail at line 464, sc->sc_spec remains NULL when calling stge_detach(), thus bus_release_resources() at line 704 will trigger null pointer dereference. We need to check the nulliness before calling bus_release_resources(). PR: 258420 Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34629 --- sys/dev/stge/if_stge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c index c9f71f01278c..a043ca9a6e80 100644 --- a/sys/dev/stge/if_stge.c +++ b/sys/dev/stge/if_stge.c @@ -699,7 +699,9 @@ stge_detach(device_t dev) bus_teardown_intr(dev, sc->sc_res[1], sc->sc_ih); sc->sc_ih = NULL; } - bus_release_resources(dev, sc->sc_spec, sc->sc_res); + + if (sc->sc_spec) + bus_release_resources(dev, sc->sc_spec, sc->sc_res); mtx_destroy(&sc->sc_mii_mtx); mtx_destroy(&sc->sc_mtx);