From nobody Mon Jan 20 12:42:15 2025 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 4Yc92v6cvJz5lHyZ; Mon, 20 Jan 2025 12:42:15 +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 4Yc92v45h8z3vg2; Mon, 20 Jan 2025 12:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737376935; 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=A0UdfaMQQAZSLqSIXrPKfcIEa/p07ZY+pkXhVPoENJc=; b=OvTTPrEb2KbWaNBHBOIGFzHXFKLK6sawNBaDIiwZBkvBk+0OH56WFKwetB4FDZbU1RBbms LRDX4mXfztNcZcZhSo9RMv8vvtQJYcpv0iQcP5CLtWEtpr7tRnwIxofztfI+0CVMWwG5Vq VGwmdMvIpGu5GkA83pNsomx3MtVITr1MuBguUJ2x13D0ldDCZuAfDDd9uBnAcNj4Dt5+AI Iy3QGwq5Az3IiD5OElXVYz8JBPaUQ4jioIgieWZYk05PABa70t/uK3KV1CbCDBZT3eoT/d Xowx5EDrPwJQPRLS50AOBVgjnx/aXOLgZTtE69qXk3znAIu4kAC0X9+t3NcInw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737376935; 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=A0UdfaMQQAZSLqSIXrPKfcIEa/p07ZY+pkXhVPoENJc=; b=fRO5y+OaYABRrRIzwL+T2Sp9ioLjCfnHznkKIDdu/wUJpQbWTRyCsH8L6h7JVHGcaPfxpV 1Ko+aHzNmQDyUOcZhn+VaieB64ItNbwDHX9ZbNtNTTnnl5BQrAy1m57sm2zz2/LVUfL2hq e6SMTqZw37bnbg4efBAYuVy+BECszHWs2N0dAyxaTU5CbPRBBsmYMOmcXjBTDllf3g1mWf 8kzZvLi9eOzVQtPsdyvQan/yk3ncyCIeoyeutHa4ylHYBsJoXoFUvuOTu1z6/cbYiuOpk5 jIIxighzDfnWV2j6zkUZ92apR5CC+Aycspu8Ip+sfeUBeGThxsTOTumQFam1Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737376935; a=rsa-sha256; cv=none; b=FWhpP5kuoh0pI8hFF0d+zo4by5jZe4eYSeSwjteEHMASgtmIaTZwMfE1phaQ6SnkYbEjjm IdDk7lvrJJ1H8VVLHZ8r5ngCvEI4sSqThqCKvexcK2E/JH09kL+giQ1s8SJ5tyQf7STCXC aQZdtEjSBswa51NOwMeu7au93DicBe7DCBgqC7153Fs5lVmMVAeAZxKscMEhtQy0E4pHTK 5jSnHq+h95FpkM1reP9v/IdUBqWfLaUOu0IcIXAVbWW343BbPQez5BJF8SbZ+uvk5jWqp1 l/4SUQH0knVtMRt6SlJyaCOLwGIxxNQ0hnEaqik2qIvyvGMM0WAY5rlRovaIyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yc92v3cv1z5dm; Mon, 20 Jan 2025 12:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50KCgFC7098477; Mon, 20 Jan 2025 12:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KCgFBW098474; Mon, 20 Jan 2025 12:42:15 GMT (envelope-from git) Date: Mon, 20 Jan 2025 12:42:15 GMT Message-Id: <202501201242.50KCgFBW098474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: cdd9dd5ac768 - stable/13 - cam: add missing zeroing of a stack-allocated CCB. 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cdd9dd5ac768675c1e67b6aa33f8f1c0ae56534a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cdd9dd5ac768675c1e67b6aa33f8f1c0ae56534a commit cdd9dd5ac768675c1e67b6aa33f8f1c0ae56534a Author: Edward Tomasz Napierala AuthorDate: 2021-05-16 09:28:04 +0000 Commit: Zhenlei Huang CommitDate: 2025-01-20 12:39:27 +0000 cam: add missing zeroing of a stack-allocated CCB. This could cause a panic at boot. Reported By: Shawn Webb Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. (cherry picked from commit 0f206cc91279e630ad9e733eb6e330b7dbe6c70e) --- sys/cam/ata/ata_xpt.c | 1 + sys/cam/scsi/scsi_xpt.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 81e6269dfa0d..c20c8626e395 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -2181,6 +2181,7 @@ ata_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb) struct ccb_trans_settings cts; u_int speed, mb; + bzero(&cts, sizeof(cts)); _ata_announce_periph(periph, &cts, &speed); if ((cts.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) return; diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 28d6445afac5..3b3aaabf2968 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -3144,6 +3144,7 @@ scsi_announce_periph(struct cam_periph *periph) struct ccb_trans_settings cts; u_int speed, freq, mb; + memset(&cts, 0, sizeof(cts)); _scsi_announce_periph(periph, &speed, &freq, &cts); if (cam_ccb_status((union ccb *)&cts) != CAM_REQ_CMP) return;