From nobody Fri Jun 28 10:17:51 2024 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 4W9WbN1RmLz5FDF2; Fri, 28 Jun 2024 10:17:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9WbN0XLxz4nwk; Fri, 28 Jun 2024 10:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569872; 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=HH4g3cDMid8JajYV1Sqxc/U/4DOlzu6dKDQAnmBgCa4=; b=GXr/DrHU1d3YYqwjLCR8kszz83IjwT6XnSdh7YmdfmDrZQsRpFdToDdBCcRS2NjlmdRTH2 caVTCQPm3vaqhtPlv81YhjleVenmopZOmhRsc3xWpD7YSHZl1R5Sn9KVF9uY5HZEZKm7Mk fVPK1Ar0RiR9LVWvroulHDkSD2o9GMIfCeE07X2QfbIoLXnU7DGpvMpLW4ifpY0DDZPOFo xyMtOXxKuMZdY5c1sEfuuHKk2/k6CBpDvpsojA0NXypcrwDPGadZDihyz24Wy4ZB9J7Nqh CkwYrQYywK556XXeH7efrlKZC0Ei9NqA4cAFicM4h21eL6F7QsqzL2vJriCIWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569872; a=rsa-sha256; cv=none; b=Yu1ceZGlBVkaoApQL74w2Y8CEPF46T/Eb7XTpJ1sHwG0gd0NcVs4rVSqGUhRFfjsFQxM7t MKPC8MMk/NawMv/Jlwhau5ixMUxgzuj/JsBabYMbIlZ033HfdWKn7pMObwW1xXx+R4sJDY +3txgn6zSndgf3HSN93raN4FhbgG9gHbrD/eOM3kz4P8lE1W520IH7ni8Yuxy276P0afWn PQxDAEWVH4FT+/TSH0MS+mgEqUjOLmK11YN42qRw10Dj2cEro4kmi5mgXPbPD4zhWKhPW3 lzQXBminUNIoWZ0jKcZBpcvveaHFrhsw5LlH+Uc89tn1wSYhOZJq/4aQgjOyxg== 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=1719569872; 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=HH4g3cDMid8JajYV1Sqxc/U/4DOlzu6dKDQAnmBgCa4=; b=OTgF2q854WaHN2iahGxVh191xbpjXUB2lBUQY1sCA/3rJ1iHdTjXkC90RNc30DN/FE3R9v fMhuWsiHu76b/kkRUOkCiAiatuzl5KP60H2F6o39q7twRLCWJg7DgaJY3UAXfc1qK5HTOx oPaT3mxwnGx8jWLCk0jz8xRpQpMYF4BbXALeIDGEFvqlm/d72Sq1SK4DVfRrDlR87ST3+n /ayVT9FHd0EzWI8YBGuU0YGkIFafcgmsKSqHRf6rsETNCI/hpYQuFLRCLQEFKO6KyuVK4k fi6SKVUMpXyNlKnAeuO0Dt0TbbOvXEifxEfFCT8lyPpuS22Zlj8RPfpM6vTbyA== 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 4W9WbN07XVzrMC; Fri, 28 Jun 2024 10:17:52 +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 45SAHpHg075779; Fri, 28 Jun 2024 10:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHpcM075776; Fri, 28 Jun 2024 10:17:51 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:51 GMT Message-Id: <202406281017.45SAHpcM075776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mariusz Zaborski Subject: git: 7fa105d91f0d - stable/13 - isp: fix ISPCTL_ABORT_CMD switch case 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7fa105d91f0dd31d55d178811cc5a62f6fdbd501 Auto-Submitted: auto-generated The branch stable/13 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=7fa105d91f0dd31d55d178811cc5a62f6fdbd501 commit 7fa105d91f0dd31d55d178811cc5a62f6fdbd501 Author: Mariusz Zaborski AuthorDate: 2024-06-25 14:50:28 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:19:14 +0000 isp: fix ISPCTL_ABORT_CMD switch case Prevent kernel panic by not running ISPCTL_FCLINK_TEST after a failed ISPCTL_ABORT_CMD. Reviewed by: mav Tested by: Arne Steinkamm MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45718 (cherry picked from commit 8aa9192ce98aec07b24f8279c709237dd2c4421b) --- sys/dev/isp/isp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index b53171add5f5..ad6dbd1e6f76 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3088,6 +3088,7 @@ isp_control(ispsoftc_t *isp, ispctl_t ctl, ...) if (ab->abrt_nphdl == ISP24XX_ABRT_OKAY) return (0); isp_prt(isp, ISP_LOGWARN, "Chan %d handle %d abort returned 0x%x", chan, tgt, ab->abrt_nphdl); + break; } case ISPCTL_FCLINK_TEST: {