git: f8b102d9bb63 - stable/14 - ctld: correctly parse LUN size on 32-bit arches
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 17 Apr 2025 23:39:42 UTC
The branch stable/14 has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=f8b102d9bb63edbc4fd63435800147881226cee6
commit f8b102d9bb63edbc4fd63435800147881226cee6
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2025-01-17 17:36:08 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
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,