From nobody Sat Mar 05 01:55:28 2022 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 EA8F119EE5C0; Sat, 5 Mar 2022 01:55:28 +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 4K9SV853Yyz4dnX; Sat, 5 Mar 2022 01:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646445328; 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=fzIJu+aOGJg5NRugOklnUR//wwP7szZuXnjgRpIpK8w=; b=vH+pimmMjVpA1ttyX3t4hxOR6w5cZ2xBEaH4yrvJMTtIQtiy+alXEbNEIZBduEXwL2TTpo rNsulqn/miQ8IqOBxLeU1mlbxfBRjxMe1y07G6F4g+ePYqTgbDXdGJ1AZ8wSAfpdJJKbhp hyr3ewZ3jFHeTLGPGDWOgsySLqWPOerAtjGN+YALiF2gUZtmDPS1vHadZzYgawnAu31r/X StHWmpnj3XQr9NX6WdF2Adjjm/s+EuMxaHg+DrDgsMivaWqCOCexZx4vTJC0SikuxVkJZ9 G0aBDLhCuxYokgx42EHxhlJJEcLgqCnUT4NFPxqZEPvnWQPnSDC+14DtK3sc9w== 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 8E33317849; Sat, 5 Mar 2022 01:55:28 +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 2251tSeS066316; Sat, 5 Mar 2022 01:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2251tSvn066315; Sat, 5 Mar 2022 01:55:28 GMT (envelope-from git) Date: Sat, 5 Mar 2022 01:55:28 GMT Message-Id: <202203050155.2251tSvn066315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 25375b1415f8 - main - ahci/siis/mvs: Fix panics after 3394d4239b. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25375b1415f8a0b0290b56c00c31d20e218ffab9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646445328; 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=fzIJu+aOGJg5NRugOklnUR//wwP7szZuXnjgRpIpK8w=; b=MSoLzLjAgohT9KSZ/h1N5jPL1LWVZNxUuEjCplJQAWyHnlMTx4bkO9N1D49o38AmdFAw6V 47f/WVHBtsoDOJ3eDkz5mWos23f0tLaeqMrMzn4VrCyif8jZGnhagsCVr5XJjhsuBL2OpQ prooKBQQLDxTizgKPuI9G6nK2209XH8FjbW+09FevSxqT2srOpzX8oAjUGOqi54gM2DeFf NfuvZ+CAYQRrYPNkMqL0eGQ2tx0EwvALrv5M0k58OGr5mQTuDyVzGsGqHQ4gFnkDPjwMiz oXgybTLg3uRsT8dRypEtaMrgp6Bd7vwXfAzLgI0Tt4YGNRC4UPbdtRbazk+asQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646445328; a=rsa-sha256; cv=none; b=VaMKDa8Yr4OR76+51XNa3Pa37r9pfj36j3OTAYg87kBxypo+5bwRTMwqVZSGj44ymZZeYz nZgJmu/YBXtJ0hb4rgkNR9+NTHayContoSZKWnRZHc0fW3LvFUQTjuB3Huf2Cl5eSOqd+N tlHiic4/9oliY+pz61CUBqFttorLZCsk3BW+9Ii71BqkjnLPgt7zhnAKfVBl/W/HAl2Iwv l+JvhpSIZQVKZKuQDK++yxFZ87cU7RAqvJHtbdPDEy8/tUeTUfKre1C/x8pJdXyK1iJRj4 ZJSlYRNWF1elD7wSo+nO/SCxry4k72oQ8JrBl3dnQ8gfOIglyLj1hLcIiIkG5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=25375b1415f8a0b0290b56c00c31d20e218ffab9 commit 25375b1415f8a0b0290b56c00c31d20e218ffab9 Author: Alexander Motin AuthorDate: 2022-03-05 01:49:05 +0000 Commit: Alexander Motin CommitDate: 2022-03-05 01:55:23 +0000 ahci/siis/mvs: Fix panics after 3394d4239b. Full CCB header overwrites made frees go into wrong zones, causing kernel panics. Instead of copying full header use xpt_setup_ccb(), since the only field I see used from all the header is target_id. PR: 262263 --- sys/dev/ahci/ahci.c | 3 ++- sys/dev/mvs/mvs.c | 3 ++- sys/dev/siis/siis.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 12e6ee8102da..d62a043eb2ab 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2178,7 +2178,8 @@ completeall: ahci_reset(ch); return; } - ccb->ccb_h = ch->hold[i]->ccb_h; /* Reuse old header. */ + xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, + ch->hold[i]->ccb_h.pinfo.priority); if (ccb->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 7ef3e50e25c6..96275ed6e572 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -1801,7 +1801,8 @@ completeall: mvs_reset(dev); return; } - ccb->ccb_h = ch->hold[i]->ccb_h; /* Reuse old header. */ + xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, + ch->hold[i]->ccb_h.pinfo.priority); if (ccb->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 19b73f71be8e..93df7c4f1494 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -1396,7 +1396,8 @@ completeall: siis_reset(dev); return; } - ccb->ccb_h = ch->hold[i]->ccb_h; /* Reuse old header. */ + xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, + ch->hold[i]->ccb_h.pinfo.priority); if (ccb->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG;