From nobody Mon Apr 08 19:04:42 2024 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 4VCz6f613Kz5HYlr; Mon, 8 Apr 2024 19:04:42 +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 4VCz6f39fkz4gsM; Mon, 8 Apr 2024 19:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603082; 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=Nrhn/wFrCaBSUI0/jG6kJmSS16YK3u8+gDUl9Cwr4rY=; b=Ky1tLei7gBlKQYe1ncX1hj4iPE7wWaODjZvB36LJN8hmJFDGcfo4+QqEbxUYpfPWLpCnKJ nAO/IJRYjM1VxzmUAotj1A+5z89rgd4tWwy+r/Kqu+XIw0EeJuBWX+hEkS4oKjFCU2wmOy z5p4z0UvI0wRudaXdSKTPVJC096oJJxK0gV9lkjBCy09ouYCSWfelKyrLL+mteePAJFrL0 7OEc5/0ofRR9p3HrjrYFyNhEP4e735J5dWD7jfIU2Kc09B2ktwSB24wydJFMURYf8ruwfn dA4X/+wMest8kmWzdKjjYZgw4XlUqn+3oJ1lma1JFy6cmennJIsdQGbwHy/xCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603082; a=rsa-sha256; cv=none; b=Bk8cH5Auvn8a1q1w7FOWm76yU/Eev/EWxsvnUmO3DeXRVOqvmtxz5G+cce4kF5Osltwpzl qO1hpH2pi/qU2/WhQUFjdedHbKN6ou8ulcS5wb882bbbZq77QGgsGc+hbOfqBYBRDUgXkR rjPjAuwulffSc/dAB6POI/wNj5rtDz5YjFsOkdDgkIUVjvgbzB3Fekw+LerrAyOaQy92W7 /LKBQGDNZ7nhD35K7xYfCX8vzBb3yuEtwssgKcFuCP+f45IrIRQL4iFOK6ZFmBRSXhbPs0 uW4TWvsUM8s6VCq4btuO6AMb9j1TBZvSxOU6a0b9SpBchIpyPXJEB/hDIacR6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603082; 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=Nrhn/wFrCaBSUI0/jG6kJmSS16YK3u8+gDUl9Cwr4rY=; b=fu9WXbRBZ3uRQfDu07G8mUaO87va225jR5HyviGVl3r7NC18zEKzMELtHOCxHBPBqSVHHK MV46uEfUceiGH1H3ZMZZmNKek6QoATEVqT9DXQIB9B2ZqzhAOBLaUx8BNgHt7+VG94nvSD zJ5ZyjevVGTKNXuh5X0Jd4ybBCAsdAX3b09TrD4Y54lQSBoeMph2iGaGVYcpyvPhnGY2CD F9N5hX24WJHaW35W+mEAHeSlRgJtw69RZM7hdUmeam1qJXSN5W5UlU7e5nY560ltxgqVI0 hxLOIwuMUy/vGFva5IGybjGDVMrZZEOkBHcOjv1nUm6qyR+GF1UWO3CtokOeaA== 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 4VCz6f2pZhzNSn; Mon, 8 Apr 2024 19:04:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4g46094894; Mon, 8 Apr 2024 19:04:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4gOk094891; Mon, 8 Apr 2024 19:04:42 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:42 GMT Message-Id: <202404081904.438J4gOk094891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 05a831511b78 - stable/14 - nvmecontrol: Update the test for a valid firmare revision slot 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 05a831511b787eba136c96dcd0985cacb18625f2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=05a831511b787eba136c96dcd0985cacb18625f2 commit 05a831511b787eba136c96dcd0985cacb18625f2 Author: John Baldwin AuthorDate: 2024-03-15 15:18:47 +0000 Commit: John Baldwin CommitDate: 2024-04-08 18:01:30 +0000 nvmecontrol: Update the test for a valid firmare revision slot Reported by: Coverity Scan CID: 1539214 Fixes: 7485926e09a0 nvme: Firmware revisions in the firmware slot info logpage are ASCII strings (cherry picked from commit 1b38f851d809950cfe112c705029f40edd0579b3) --- sbin/nvmecontrol/firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c index 256847ef8ac2..80bbff032cf2 100644 --- a/sbin/nvmecontrol/firmware.c +++ b/sbin/nvmecontrol/firmware.c @@ -105,7 +105,7 @@ slot_has_valid_firmware(int fd, int slot) read_logpage(fd, NVME_LOG_FIRMWARE_SLOT, NVME_GLOBAL_NAMESPACE_TAG, 0, 0, 0, &fw, sizeof(fw)); - if (fw.revision[slot-1] != 0LLU) + if (fw.revision[slot-1][0] != '\0') has_fw = true; return (has_fw);