From nobody Thu Apr 17 23:39:42 2025 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 4ZdvWM2Gbfz5sytP; Thu, 17 Apr 2025 23:39:43 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdvWM1ZvVz3RSM; Thu, 17 Apr 2025 23:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744933183; 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=CDW0/5dLF6u6X5ZqlhlTdLKlF9V8hNNaRvUOzpYpUVk=; b=B+O2jgmXpPpuGgVETPCjpA83d3zq/gt7yJXOo973U+A00xsyfTOtCmwUE1LYrvRYkUQwdb C1/jNnsagpgnIWHCzJsIKqq4mDxuM8ytJxEbR+EKGz7srL6cFqi6Q7qlMzEipfw8xvXtrB MGmGdj4n1mr314gMKB0qN0dXHYXPWwC7x6WauhWZkOog6udkKxShbxbWyJHzPQ5HRTQkpX Xoiz/sQMtcJxWN5+w37UFZ+eIBczV9a3YGH/QV/D6fGknPgQ6zqnLvw03AfVWFiJh+wgz+ 09o0BOpOBHIb1QM1w567umf3sT4wa2XapiFBLGYFrhqkQ+QEwWHJ4NRTBZvzng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744933183; a=rsa-sha256; cv=none; b=kRNrZVzYdurxSRbgnMC69Eg8sL7kdDvvo/RfBFUk2NBxv8qFT1DQsqW0/WqD2l5Wv9otQU XtXPdmEStZAy8LcjpYlmggCgKja67GVksDatD2Cna8bNHo+wvBm90DsDUkP0+I+j1aNwQR zddrqrPJve8r9WmP5WGH3m5+XryUeACOxKXOVpXR5tKgNjaIe0CWkczEmMqZsxwn+McCEQ NqPhX3l/OeCfHcioC4JkrPsq4MV8SpOfszh/Yrq7mJzrO2SfBvjtaw66PgYaewtey59l9j yJTp0g+7eOCauEwh0yphDHEdcY0bky1cZJEN/0XtpBa2q6sD66kl4AcLFj5SDw== 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=1744933183; 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=CDW0/5dLF6u6X5ZqlhlTdLKlF9V8hNNaRvUOzpYpUVk=; b=ErC5nz4wBwf7f9yTdICXyt1AvduV1fUZa5sIXCPgYr6qSra/7RwaPr4vBJkpqNNecpSHLG hbugrkCdY79lcjYQPjLMdY7pZTb+UAVU0ECMZyqVAJjwtw4gT0JaPQ8z0ZjnUqyAuPPIC6 gYJIjcry4OrpmsO3NaypUi4QWqugSPDDAM/1rslLgHI+qsn3b22s4BFVFA0Szhy4w7Tblm T11GWGRbUyXnQVgOYuVe3VGa/E9lDj5C40PyDVm19z+yGUl5o8DyUeqLlfaSJK5kb7ld+M D3/onVWdk9i+RhtkavwCCmz12n+tqlwdx2FErvXrTIVkNR1DRQaOvGl5Fxnjuw== 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 4ZdvWM0Yd0z18Cp; Thu, 17 Apr 2025 23:39:43 +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 53HNdguJ090132; Thu, 17 Apr 2025 23:39:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HNdgOP090129; Thu, 17 Apr 2025 23:39:42 GMT (envelope-from git) Date: Thu, 17 Apr 2025 23:39:42 GMT Message-Id: <202504172339.53HNdgOP090129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f8b102d9bb63 - stable/14 - ctld: correctly parse LUN size on 32-bit arches 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f8b102d9bb63edbc4fd63435800147881226cee6 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b102d9bb63edbc4fd63435800147881226cee6 commit f8b102d9bb63edbc4fd63435800147881226cee6 Author: Alan Somers AuthorDate: 2025-01-17 17:36:08 +0000 Commit: Alan Somers CommitDate: 2025-04-17 23:39:08 +0000 ctld: correctly parse LUN size on 32-bit arches Disk offset values must always be 64-bit, not size_t. PR: 214874 Submitted by: pprocacci@gmail.com Event: January 2025 Bug-busting session (cherry picked from commit f26fe2c6669d56621ac85f5279aa85503cbf59bc) --- usr.sbin/ctld/ctld.c | 2 +- usr.sbin/ctld/ctld.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index 9be0f6975437..af8874bd00b8 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -1569,7 +1569,7 @@ lun_set_serial(struct lun *lun, const char *value) } void -lun_set_size(struct lun *lun, size_t value) +lun_set_size(struct lun *lun, int64_t value) { lun->l_size = value; diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h index e1bab1a8e3b8..3f4b653d6896 100644 --- a/usr.sbin/ctld/ctld.h +++ b/usr.sbin/ctld/ctld.h @@ -349,7 +349,7 @@ void lun_set_device_id(struct lun *lun, const char *value); void lun_set_path(struct lun *lun, const char *value); void lun_set_scsiname(struct lun *lun, const char *value); void lun_set_serial(struct lun *lun, const char *value); -void lun_set_size(struct lun *lun, size_t value); +void lun_set_size(struct lun *lun, int64_t value); void lun_set_ctl_lun(struct lun *lun, uint32_t value); struct option *option_new(struct options *os,