From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id F060F77388 for ; Tue, 27 Apr 2021 10:17:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E58901D1B3 for ; Tue, 27 Apr 2021 10:17:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 71D6A1D1A9 for ; Tue, 27 Apr 2021 10:17:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3180E41E17 for ; Tue, 27 Apr 2021 10:17:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 27 Apr 2021 10:17:01 +0200 Message-Id: <20210427081701.9583-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [sgutils2.rs] Subject: [pbs-devel] [PATCH proxmox-backup] tools/sgutils2: add size workaround for mode_sense X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2021 08:17:09 -0000 Some drives will always return the number of bytes given in the allocation_length field, but correctly report the data len in the mode sense header. Simply ignore the excess data. Signed-off-by: Dominik Csapak --- src/tools/sgutils2.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/tools/sgutils2.rs b/src/tools/sgutils2.rs index 96625301..6ee19ff2 100644 --- a/src/tools/sgutils2.rs +++ b/src/tools/sgutils2.rs @@ -757,10 +757,14 @@ pub fn scsi_mode_sense( let mut reader = &data[..]; let head: ModeParameterHeader = unsafe { reader.read_be_value()? }; - - if (head.mode_data_len as usize + 2) != data.len() { - let len = head.mode_data_len; - bail!("wrong mode_data_len: {}, expected {}", len, data.len() - 2); + let expected_len = head.mode_data_len as usize + 2; + + if data.len() < expected_len { + bail!("wrong mode_data_len: got {}, expected {}", data.len(), expected_len); + } else if data.len() > expected_len { + // Note: Quantum hh7 returns the allocation_length instead of real data_len + let header_size = std::mem::size_of::(); + reader = &data[header_size..expected_len]; } if disable_block_descriptor && head.block_descriptior_len != 0 { -- 2.20.1