Author: bdrewery
Date: Sun Mar 30 16:56:36 2014
New Revision: 263944
URL: http://svnweb.freebsd.org/changeset/base/263944
Log:
MFC r263130:
Fix -o size less than PAGE_SIZE resulting in SIZE_MAX being used.
Modified:
stable/9/sys/fs/tmpfs/tmpfs_vfsops.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- stable/9/sys/fs/tmpfs/tmpfs_vfsops.c Sun Mar 30 16:51:12 2014
(r263943)
+++ stable/9/sys/fs/tmpfs/tmpfs_vfsops.c Sun Mar 30 16:56:36 2014
(r263944)
@@ -237,11 +237,13 @@ tmpfs_mount(struct mount *mp)
* allowed to use, based on the maximum size the user passed in
* the mount structure. A value of zero is treated as if the
* maximum available space was requested. */
- if (size_max < PAGE_SIZE || size_max > OFF_MAX - PAGE_SIZE ||
+ if (size_max == 0 || size_max > OFF_MAX - PAGE_SIZE ||
(SIZE_MAX < OFF_MAX && size_max / PAGE_SIZE >= SIZE_MAX))
pages = SIZE_MAX;
- else
+ else {
+ size_max = roundup(size_max, PAGE_SIZE);
pages = howmany(size_max, PAGE_SIZE);
+ }
MPASS(pages > 0);
if (nodes_max <= 3) {
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
