Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sandbox: fix return type of os_filesize()

Browse source 
Given a file ../img of size 4294967296 with GPT partition table and
partitions:

=> host bind 0 ../img
=> part list host 0
Disk host-0.blk not ready

The cause is os_filesize() returning int. File sizes must use off_t.

Correct all uses of os_filesize() too.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Heinrich Schuchardt 2023-04-05 11:34:15 +02:00 committed by Simon Glass
parent 86daa47c84
commit 1a07d39521
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/sandbox/cpu/os.c
View file

@ -166,7 +166,7 @@ int os_write_file(const char *fname, const void *buf, int size)
return 0; return 0;
} }
int os_filesize(int fd) off_t os_filesize(int fd)
{ {
off_t size; off_t size;
@ -218,7 +218,7 @@ err:
int os_map_file(const char *pathname, int os_flags, void **bufp, int *sizep) int os_map_file(const char *pathname, int os_flags, void **bufp, int *sizep)
{ {
void *ptr; void *ptr;
int size; off_t size;
int ifd; int ifd;
ifd = os_open(pathname, os_flags); ifd = os_open(pathname, os_flags);
@ -231,6 +231,10 @@ int os_map_file(const char *pathname, int os_flags, void **bufp, int *sizep)
printf("Cannot get file size of '%s'\n", pathname); printf("Cannot get file size of '%s'\n", pathname);
return -EIO; return -EIO;
} }
if ((unsigned long long)size > (unsigned long long)SIZE_MAX) {
printf("File '%s' too large to map\n", pathname);
return -EIO;
}
ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, ifd, 0); ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, ifd, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {

3
drivers/block/host_dev.c
View file

@ -24,7 +24,8 @@ static int host_sb_attach_file(struct udevice *dev, const char *filename)
struct host_sb_plat *plat = dev_get_plat(dev); struct host_sb_plat *plat = dev_get_plat(dev);
struct blk_desc *desc; struct blk_desc *desc;
struct udevice *blk; struct udevice *blk;
int ret, fd, size; int ret, fd;
off_t size;
char *fname; char *fname;
if (!filename) if (!filename)

2
include/os.h
View file

@ -64,7 +64,7 @@ off_t os_lseek(int fd, off_t offset, int whence);
* @fd: File descriptor as returned by os_open() * @fd: File descriptor as returned by os_open()
* Return: file size or negative error code * Return: file size or negative error code
*/ */
int os_filesize(int fd); off_t os_filesize(int fd);
/** /**
* Access to the OS open() system call * Access to the OS open() system call