From nobody Fri Jun 28 10:17:16 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 4W9WZh4nkLz5FD7p; Fri, 28 Jun 2024 10:17:16 +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 4W9WZh4Fklz4nfH; Fri, 28 Jun 2024 10:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719569836; 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=5Q5CbBBCIM1SfVLJWzgtXKvJMzkbCidIxnryGigDuOI=; b=ykkD10CS3EO42JNohWLS+iJqWsTa9Xe4E15UA/s0W8xr3vuCueGjGKQ7Bi6jDxTwz+ZK2C +6EBrErT0NsWR4wRuqd7YRPU0Y462qvOZOawMx6/0wKJvezKNogdUoKT+lw73HGPPosMdI YBbsOFuQEd2xj7rgYFmRU9jui1GG2QfXZkHRo/jcndWtyc7186fyH7bUu3TLO7hKRuVJ29 J/SECGfQeYUP0Sq1PqNPL79X0hkn0qIzWX8X3lfZBEsEqz3yHFxms4uwj8b+ixtAlOpYXC Gspgh/uC5H/GWk6zD6Y75ccS5nJbUZakY2e6Czfr/2uoy1ZPzIiYlFiYEPWCVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719569836; a=rsa-sha256; cv=none; b=ScbFfdQpIJgBrSJaQ1ebHm2jkj75GU63oYRpNlj8BaQWCwAxKfa4ittKoxs/5SOydhZRtF GI7u5nUeXC8jTc6esNmY7cbO+qWal5zV6DeY9tNC8kdCui9cUfzOa3eMJ/yp0FqtEUC6lb U5XpSARiN4KWAqRbyjL+sje6qRdgR8I/XkWBjQ2Ohhzv/IwJ46vkJ1JJnKSZc371Q4e9Le S/JQAsdUmt08JHPORM8q1QzKJ2OLKKHoGWmq4GJh2GhftF/rk7+39KNaNWQxDO7iVbX7WL /vSnU9c4Y/mGvYcNifHNMTzh/9l2PbrA081eexlYWagjPidFwSUjv6PllY/jgw== 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=1719569836; 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=5Q5CbBBCIM1SfVLJWzgtXKvJMzkbCidIxnryGigDuOI=; b=NABtXQ38yJ9hijg4hFa21apyae4iPngBv+HubmECBAsEjQtXfO/IzKD2cHcRIcdpFGFfXY 3lhOOuUGmYlnERoBDRzq2PhVRvIhd/h5L/Hq/C3Tqz/r9o4Pf421S0iPOFje8FFUaS38MT R4us85/KRQNiMnZbdBjSq841/bxXrtQHwINhSbLNCLEgkQ0POZw0ohNa6ovFAkMYrV6MB6 mQGreRBaHFH8mGx7+YO4khwM2A3v7GPP/pRuyKcQawA7vD0Lw8KzaW7oS9xaxUABiU/+K6 Szt96b2rF34QuDZwugSN6kzy7b3dZ1niWoRQXgJbgIq81zS+PLHytAZ7sKjBOg== 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 4W9WZh3sMQzrsr; Fri, 28 Jun 2024 10:17:16 +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 45SAHGmr075574; Fri, 28 Jun 2024 10:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SAHGYs075571; Fri, 28 Jun 2024 10:17:16 GMT (envelope-from git) Date: Fri, 28 Jun 2024 10:17:16 GMT Message-Id: <202406281017.45SAHGYs075571@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: 944827bcf6f0 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 944827bcf6f0b7db74d47e18885d327a623ef6b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=944827bcf6f0b7db74d47e18885d327a623ef6b7 commit 944827bcf6f0b7db74d47e18885d327a623ef6b7 Author: Mariusz Zaborski AuthorDate: 2024-06-25 14:50:28 +0000 Commit: Mariusz Zaborski CommitDate: 2024-06-28 10:18:23 +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: {