From nobody Fri Jan 17 21:43:35 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 4YZYBw2sgdz5kH9G; Fri, 17 Jan 2025 21:43:36 +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 4YZYBw0mY0z4FrD; Fri, 17 Jan 2025 21:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150216; 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=TmUkgx2KS8ooFa1ShXY2HT3STDeDhgI/nrbMmqLxK+4=; b=jpr5RIqhhvnH+7v+B/mm/yURuTdsxwbMVVqiQcYtYRXXeGGz3C/ophk1YtoE0XmG0ojIuI WX0oyAsD50PJOBcCmMz9Pwii7XpNfPnpydFQ2sAS/Dt4KzkLQ/pDJBHR0nvH2yeNiqMxxv ddbJ6P5sazJHdBiF04tooxe6JRNhoM2aLihc5KkPRnF54CbzWMOdmfaM45gcqTk7wD8zuY x/X/k+FKvbBrItPDmXvS1zeyybNt/eYzuSbvukBj9T4txRY+CZnmjqJyFVA1PYbnix8bdA SVtU//9i1N3s4sLVs+Rz8u0R9UOIa97DTOyleoyCxSk4wm0Da4ofhmMEB9wr6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737150216; 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=TmUkgx2KS8ooFa1ShXY2HT3STDeDhgI/nrbMmqLxK+4=; b=q+PZ7AIxOTyf5nW9KL3kpqXtn8PuuxCugJOnvhdqOAfS/sq1olHOASE4r/UkJS65rs46hR 64PCtrM+DRj/aTPjBoij42QGhBqKePEp5fIylVWDBCdFSGu2qcwcRpWMY3CaL29e5qQ2WS ZvXj+Vd5sQpcC4x8ypKup18bPzF34A69m/0cIWGQJc8NZh69K5EgcwtpQSol2Lcopc2ZZs 6rLUJgEjWrakL3amRV+nxIbIBz+3ZU0a/5GE/cZmYBu2DSWG7PGyMboGsqGYFrAhinb5gJ oB8M9rbwAFGLzDtD3FWMUrlDRxp5Xbqz+hywgRN7Eqk2StRJkjUBeHLrHWn/xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737150216; a=rsa-sha256; cv=none; b=Fqsq3hwx4OOWh2EDsq83Xe+021TxKgCsOeGONMH7Vr4iaiMKDUEtmafGCb9IrOWMEqzTbs VrWjJ459l3xmPksPd6eORydOAgbKt/O9axWutvksswXfficjvdzQTlryvXEBX184XODf8p 4aCr00ZTAv7sHbopqdEwveJCXeVPq/LNL86zewcDplM5ozztlkA1OUjT0TYMvW67IQ9YZi C4g1pFBkrQA7kg6JQHP+bHh/GxgiQ+Uh0vze5v8VwYqvm/TPUXYdwbJKi8DBAniTBhb4qy 0/2nqea3e6YhahsRAygQUT2J/G6I6nAeWTIxuReOVVD8NkbJNPAq0CcXnI27Tw== 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 4YZYBw0HDRzcTR; Fri, 17 Jan 2025 21:43:36 +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 50HLhZAf061310; Fri, 17 Jan 2025 21:43:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HLhZNx061307; Fri, 17 Jan 2025 21:43:35 GMT (envelope-from git) Date: Fri, 17 Jan 2025 21:43:35 GMT Message-Id: <202501172143.50HLhZNx061307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: f26fe2c6669d - main - ctld: correctly parse LUN size on 32-bit arches 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f26fe2c6669d56621ac85f5279aa85503cbf59bc Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f26fe2c6669d56621ac85f5279aa85503cbf59bc commit f26fe2c6669d56621ac85f5279aa85503cbf59bc Author: Alan Somers AuthorDate: 2025-01-17 17:36:08 +0000 Commit: Alan Somers CommitDate: 2025-01-17 21:43:09 +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 MFC after: 2 weeks Event: January 2025 Bug-busting session --- 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 346d1908aa6f..497e0f6e7600 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -1568,7 +1568,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,