From nobody Tue Feb 4 18:31:52 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 4YnX5N3ZkMz5mFln; Tue, 04 Feb 2025 18:31: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 4YnX5N1Rxxz3pVj; Tue, 04 Feb 2025 18:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738693912; 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=sdot2amCxS43PrEssVhRYAjCrnzjcDx/t2yemVfabUY=; b=vTGyh4APAr1L5vVniCV/g/orkvd6xeQIXhtmOOWx3hBaE8IIlUGsb7zO81uiYVqqM6N6TW yRTx/ywNpjvkX70mguqAm5HQoWFkioN6bJLoww6k99zL845yJdZsIdZ5GMmZUdgfk/iv7u Wz3+sRP6HkTWfTGBXLz7uuNR/bVc82koNnpzoAlQKPuursP1MaP91CSqqmJbFSWoSuUeFG tDuLUa1K0ab78e6kyxQ5rVnvcYTXs6arftGX2qo+CWZFUMLnyKUqR8Hbd/NKMFMSLK0ANh A2AKQrvzJvbDdxupBAmE1cgTtMwkeqJbs2TrPvwzHspBsp0zY5S+mLLpk3TU9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738693912; 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=sdot2amCxS43PrEssVhRYAjCrnzjcDx/t2yemVfabUY=; b=kr08YfhFodYU7G9sIXrwLZW8Rd2LIXSOSmyz0zvHRi1QOhiVG8nqmA1NIi+Ydb4iTR1ppw EPc486qLbaWWvnNGkxnmrFxHspZCGY7Fe/zJT6jCIQjQBuDWfh+TRwKJU2zjqmGFOWDtk4 AK+ZSKmq5yJho8dJNOiEDSGSmh5a55+5d3A9nw02z0zIkzvsuergB05SHBD8GU0h88590Y zsyLVYioAMR5IQl79CkQ+196ol3nKE1ZACICKHFLDvO7Dcj9dxw/6bRLO85pXTLRNfG46I QnmUiYtOU3pBU/KCk4tDTh1JsmWGAQOCOp5DToAANFftYFubpskToZPAP2l5/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738693912; a=rsa-sha256; cv=none; b=O8GNDmPmG/O91qRnhZKI6bn78P1jwlnGusmgwKNSIOoWgWvtKky5DizSZGNO3RuqJ74T8U ovsulr32PIGlpwq633zDNX3EkwGt4SOaUW9+HfPRZHruI8KEd/AZsWiV5gE8pZDjCWjrpt vI+FhEmUZwExLUdtJzpCURHl2MlDeAPcK7owOnbTvnuhuHnQUFB1SeH5jh3di3ChjEJaaF UoCP8CK2kVMTsfTBSZkF4KUlZjHx4reOc+KjoRE3nCB3Y/Y0zIGCY/+AzQYcZr4M84GEvU cy8yQ03EZB9o8gc4OX/3BOLI/lrtiUQlnvF9eEKeD6dM1Q/Ks3+A+m6a9D26YQ== 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 4YnX5N10TFz2y5; Tue, 04 Feb 2025 18:31:52 +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 514IVqgY035154; Tue, 4 Feb 2025 18:31:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514IVqR3035151; Tue, 4 Feb 2025 18:31:52 GMT (envelope-from git) Date: Tue, 4 Feb 2025 18:31:52 GMT Message-Id: <202502041831.514IVqR3035151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5c04086a61ac - main - cam: Fix off by one error in ASC/ASCQ lookup 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c04086a61acbc2c237ca992b85d26c933197009 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5c04086a61acbc2c237ca992b85d26c933197009 commit 5c04086a61acbc2c237ca992b85d26c933197009 Author: Warner Losh AuthorDate: 2025-02-04 18:29:04 +0000 Commit: Warner Losh CommitDate: 2025-02-04 18:29:38 +0000 cam: Fix off by one error in ASC/ASCQ lookup To implement ranges of ASC/ASCQ codes, we set SS_RANGE on an entry with the entry being the end (highest) of the range (with the prior entry being the start). When looking up a ASC/ASCQ code, however, we return the second entry, which just has the range info. Instead, return the prior entry in these cases so we can print the ASC/ASCQ code string correctly. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48685 --- sys/cam/scsi/scsi_all.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 6fbcb1fd80fe..13a376ebb6e3 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -3419,7 +3419,15 @@ fetchtableentries(int sense_key, int asc, int ascq, ascentrycomp); if (found_entry) { + /* + * If we get to the SSQ_RANGE entry, we're one too + * far. The prior entry is the interesting one, since it + * contains the string to print, etc. Only the top end + * range is interesting in this entry. + */ *asc_entry = (struct asc_table_entry *)found_entry; + if (((*asc_entry)->action & SSQ_RANGE) != 0) + (*asc_entry)--; break; } }