From nobody Tue Nov 01 20:33:40 2022 X-Original-To: dev-commits-src-branches@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 4N21v953pGz4hD4G; Tue, 1 Nov 2022 20:33:41 +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 4N21v91kx9z3F3t; Tue, 1 Nov 2022 20:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334821; 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=StII2Z582OMV0N/q7pD87pbkLaY/bUpbWWUuZ4i0ro8=; b=fielIGHcfVePGjj3Bq3JAy9jbKqor41lnOt67Me5h+L4eYfvkBcIat3c4mR1q3SeDkvwlo h7KYzXKoG6NtnqIkGbfCGBPUuaODcO32PAiva7OV+tb9FEChSp7y8pvpAU9GGBpRx0K6z4 bFShhavZWWNW6Zrz2k4b8hZQC0PXet1MXTz2oO/batxm2U+cKsSMQ+0WxZU6ucbYpwJNik kXWZ9dzcbaBQqYaTYe0M+Cd3IhanFwcOnG666qoAHE9KW5pQzjpZBkkRT9w4dpw/wyr2F4 7478/AEXNCMfM48sIrMa6Nv6AzFDWcgqhbHcaUH9NtEEDsABFoYPCCX8Wkn+BQ== 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 4N21v90KjmzV61; Tue, 1 Nov 2022 20:33:41 +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 2A1KXew2026261; Tue, 1 Nov 2022 20:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1KXelK026260; Tue, 1 Nov 2022 20:33:40 GMT (envelope-from git) Date: Tue, 1 Nov 2022 20:33:40 GMT Message-Id: <202211012033.2A1KXelK026260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: fff5c5fe911e - releng/13.1 - cam: Provide compatibility for CAMGETPASSTHRU for periph drivers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: fff5c5fe911e7067390e6ff73c4c58489a30c849 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667334821; 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=StII2Z582OMV0N/q7pD87pbkLaY/bUpbWWUuZ4i0ro8=; b=Uw0Fu6CKCM/Mp4sExBEALJai/DNdNnhVOZ/0SuSYdUG7awuryRDH9TrTNKZ+zHxlTCnk51 2n5vOUu3maaz3J7qSHK9IBPg5jcQzUPUpDQ6DmfNRqTUYkINxo9XYIESZO6XNliVndW+vl 2BX7Hd/J9u9DUAmjqMZt0WAB7oNy2TWqB8tmefuCM6GecncNBzkdHfCn8XLEjo1gsONhhH QcO7cc9axIh74vJva2lra9Sj42cnUo8hIHC0/WW+pWhlDXZlIXXfwzf20n1WKajyn289rb roidTqpwAxvVUuBDuYXoUSr2Me2YdyxXS/qowhJ5m6/+bM2x9/WWMCHvFoxjjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667334821; a=rsa-sha256; cv=none; b=Pc/u1XnoA7NgkQXzCJWO1TeYUwCsTfWEt2B+wl/eIgE/Zvv1rj/DwYaI1y1BB91wJj3fYh EwZOEcg5yS3AhoO5PuMagNO+sBYLuecBuagfu13UO9MrkEvOEG/DCZ27druQRDLnmvfzMN 6naT1/VBId0uRk1l5fa3kQyR+ZMTBFnb6o2Jyyq0dXkk7pltmVoCkuyvuOXf3YDTSp1A7/ SzjBeYbrus1P4N7TzwWOPNj4D7DuUBDgNskgZIC9T6X+6w5ua0WrZ7UVWO4FFcjUToLazv drUstrjsf7Qp0oJCs440yLS+22/1OrLs8ieL5MALp5mWVZo5kPEa0zjgOA/sFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fff5c5fe911e7067390e6ff73c4c58489a30c849 commit fff5c5fe911e7067390e6ff73c4c58489a30c849 Author: Mark Johnston AuthorDate: 2022-09-29 17:07:52 +0000 Commit: Mark Johnston CommitDate: 2022-11-01 13:28:11 +0000 cam: Provide compatibility for CAMGETPASSTHRU for periph drivers The CAM version bump 0x19 -> 0x1a changed the CAMGETPASSTHRU definition, so applications using the old ioctl are broken. However, that version change did not affect anything relating to the ioctl implementation for periphs. Approved by: so Security: FreeBSD-EN-22:26.cam Fixes: 8f9be1eed11c ("cam(4): Improve XPT_DEV_MATCH") PR: 264709 Tested by: andreas.mahling@googlemail.com Reviewed by: imp (cherry picked from commit 0cd631ee0693dd7337c38b251044e018aad6fbaf) (cherry picked from commit 16d4c1de7b40f1cc0d323b9ecc5a38afb7a42f8a) --- sys/cam/cam_periph.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index 9a4f4a2b160b..a76f20480aff 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -1106,6 +1107,7 @@ cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr, error = found = 0; switch(cmd){ + case CAMGETPASSTHRU_0x19: case CAMGETPASSTHRU: ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL); xpt_setup_ccb(&ccb->ccb_h,