sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fs/mount: Fix wrong size reported by df -h. Reason is that size in bytes is calculated always on uint32_t types and cards bigger than 4GB will overflow uint32_t type. Solution is to use uint64_t where possible.

Browse Source
This commit is contained in:
Michał Łyszczek 2018-04-14 15:15:59 -06:00 committed by Gregory Nutt
parent 9aa1c6c3d5
commit 1d8fd9e034
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/mount/fs_procfs_mount.c
View File

@ -1,7 +1,7 @@
/****************************************************************************
* fs/mount/fs_procfs_mount.c
*
* Copyright (C) 2017 Gregory Nutt. All rights reserved.
* Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -38,6 +38,7 @@
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
#include <sys/types.h>
#include <sys/statfs.h>
@ -293,9 +294,15 @@ static int usage_entry(FAR const char *mountpoint, FAR struct statfs *statbuf,
{
FAR struct mount_info_s *info = (FAR struct mount_info_s *)arg;
FAR const char *fstype;
#ifdef CONFIG_HAVE_LONG_LONG
uint64_t size;
uint64_t used;
uint64_t free;
#else
uint32_t size;
uint32_t used;
uint32_t free;
#endif
int which;
char sizelabel;
char freelabel;
@ -316,9 +323,15 @@ static int usage_entry(FAR const char *mountpoint, FAR struct statfs *statbuf,
fstype = fs_gettype(statbuf);
#ifdef CONFIG_HAVE_LONG_LONG
size = (uint64_t)statbuf->f_bsize * statbuf->f_blocks;
free = (uint64_t)statbuf->f_bsize * statbuf->f_bavail;
used = (uint64_t)size - free;
#else
size = statbuf->f_bsize * statbuf->f_blocks;
free = statbuf->f_bsize * statbuf->f_bavail;
used = size - free;
#endif
/* Find the label for size */
@ -355,9 +368,15 @@ static int usage_entry(FAR const char *mountpoint, FAR struct statfs *statbuf,
/* Generate usage list one line at a time */
#ifdef CONFIG_HAVE_LONG_LONG
mount_sprintf(info, " %-10s %6llu%c %8llu%c %8llu%c %s\n", fstype,
size, sizelabel, used, usedlabel, free, freelabel,
mountpoint);
#else
mount_sprintf(info, " %-10s %6ld%c %8ld%c %8ld%c %s\n", fstype,
size, sizelabel, used, usedlabel, free, freelabel,
mountpoint);
mountpoint);
#endif
return (info->totalsize >= info->buflen) ? 1 : 0;
}