From nobody Mon May 9 14:30:19 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 BE66F1AC995A; Mon, 9 May 2022 14:30:19 +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 4Kxk974yqCz4SM0; Mon, 9 May 2022 14:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652106619; 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=HVavbVr+NSl/3ZAIB5z8bHDSd6JmsjmvbbSA+WREyvc=; b=iDP9oND6Qp8lztNWq2SOXvyeD50ReMo8feXNFVaXMCy6zewtRIzuI8r3L6v7eReV6diZbc URx995VZwT/utrgQbEplYbRw+aOFv/fC7vmYNp3Q3e+i7P59luZXfCg4e2GZQoUl5vMn9o WKbIKHH9l10K4YfjLJ+cd5c6J8pSq9KJOii78InpWyYBvFf1fIu8qSN+yVcCICICYSDSho eqVxJ88rqiY4RbUlWAmA7k5vazVEHJAqH4aLT9wIZ1vhwXZFNMxbXn41JuCWBIDV2LJCzo mUoJwlNQohPcS5xXMBTjmZt02ttZHBUMaCSCW45JpZOQHMg2FuEUtMUE+Bm/wQ== 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 8AA0412DA6; Mon, 9 May 2022 14:30:19 +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 249EUJX6087493; Mon, 9 May 2022 14:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249EUJ8U087487; Mon, 9 May 2022 14:30:19 GMT (envelope-from git) Date: Mon, 9 May 2022 14:30:19 GMT Message-Id: <202205091430.249EUJ8U087487@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: 356155fe0237 - main - Fix bd82711aff98 serial number trailing spaces removal. 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: 356155fe02379b8bae1dc613d4df375f542236a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652106619; 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=HVavbVr+NSl/3ZAIB5z8bHDSd6JmsjmvbbSA+WREyvc=; b=lCxCc5U+pwNb3pZJNfS1Jps36IlIxpENBN39Ht0uHfqNcfu30CFat4OcRURweNoWZKdS/r KyTdfSIcEP1RQBIBLOtJoPa2CtrDUAPiyfXq+N7WXXiA+rqbTtIsWTTaXB+p2S0QIueYOJ pN3ww1shrhahwM7dBxA7Tp30mf/OBPwiVHkGwd+IHLWYKRy+ULqenp1PLgc39tJMfK6pW1 hBTC5FTLMVcqNwsBcbDmIaphVT7LwlFVHiOZdwV6b6Wg9lKXEwANYEdpzq0ankDMujYy8l zc7gsvl0UfGXoI3vxPZQ6q0vEmjGS4nZDTU38/xQCGytTRpMbJeBSo1S2fOTMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652106619; a=rsa-sha256; cv=none; b=Rd+hOO7uA+NaubZHGDxNkpkXIZWT9mdGbUBRvG/OrFduJnY5Lcwvl8D1XVRZcgDT7CMrMw mnDvdHYwM7zqLZeDme0ymAQAr3/4qHDAezc80WbIQl0xsVQ07TRDOBQDiBpEdIwrm9U9gr 6LxXA61/BVyL/wKbZk9GaJqJR1SX4SXv6H3Ytff29dJIxS/loGIVeGiePn+EXFLEjrLWd/ kbD+zI5xeR40O1riqabyKLRhtrdg7q+3itvc8HaEIAIyG8Gy6whFgRjXYcZpBdfJtb6oNv XQkfQLM3MknIlH+spR/q2x5NAlj6rNENTiTLYLEz07fPmmBlp1ixcSi1IZmRpQ== 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=356155fe02379b8bae1dc613d4df375f542236a1 commit 356155fe02379b8bae1dc613d4df375f542236a1 Author: Alexander Motin AuthorDate: 2022-05-09 14:23:23 +0000 Commit: Alexander Motin CommitDate: 2022-05-09 14:30:04 +0000 Fix bd82711aff98 serial number trailing spaces removal. For devices returning 16 byte serial numbers with 8 leading spaces this falsely removed everything due to looking at wrong offset. --- sys/cam/scsi/scsi_xpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 77c47d578ae3..8c83ce08d635 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -1621,7 +1621,7 @@ probe_device_check: * trailing spaces. Remove them. */ while (slen > 0 && - serial_buf->serial_num[slen - 1] == ' ') + serial_buf->serial_num[start + slen - 1] == ' ') slen--; memcpy(path->device->serial_num, &serial_buf->serial_num[start], slen);