svn commit: r201773 - head/sys/fs/tmpfs

[Gleb Kurtsou]

On (08/01/2010 23:48), Jaakko Heinonen wrote:
> 
> Thank you for looking at this.
> 
> On 2010-01-09, Bruce Evans wrote:
> > The current incorrect way is to use %d.  Since ino_t happens to have
> > type uint32_t and u_int happens to have type uint32_t on all supported
> > machines, %u would work but %d gives undefined behaviour when the
> > value exceeds INT_MAX.
> > 
> > The simplest fix is to use u_int and %u.
> > 
> > > +	u_quad_t	size_max;
There is also kern/138367 which tries to address the same issue,
although in a bit different way. It also introduces maximum file size,
fixes possible nodes and pages overflows.

Thanks,
Gleb
> > Even larger indentation error, as above.
> 
> Does following patch look reasonable?
> 
> - Fix style bugs introduced in r201773.
> - Change the type of nodes_max to u_int and use "%u" format string to
>   convert its value.
> 
> %%%
> Index: sys/fs/tmpfs/tmpfs_vfsops.c
> ===================================================================
> --- sys/fs/tmpfs/tmpfs_vfsops.c	(revision 201818)
> +++ sys/fs/tmpfs/tmpfs_vfsops.c	(working copy)
> @@ -185,8 +185,8 @@ tmpfs_mount(struct mount *mp)
>  	ino_t nodes;
>  	int error;
>  	/* Size counters. */
> -	ino_t		nodes_max;
> -	u_quad_t	size_max;
> +	u_int nodes_max;
> +	u_quad_t size_max;
>  
>  	/* Root node attributes. */
>  	uid_t	root_uid;
> @@ -223,7 +223,7 @@ tmpfs_mount(struct mount *mp)
>  	if (mp->mnt_cred->cr_ruid != 0 ||
>  	    vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1)
>  		root_mode = va.va_mode;
> -	if (vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1)
> +	if (vfs_scanopt(mp->mnt_optnew, "inodes", "%u", &nodes_max) != 1)
>  		nodes_max = 0;
>  	if (vfs_scanopt(mp->mnt_optnew, "size", "%qu", &size_max) != 1)
>  		size_max = 0;
> @@ -239,7 +239,7 @@ 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 > (SIZE_MAX - PAGE_SIZE))
> +	if (size_max < PAGE_SIZE || size_max > SIZE_MAX - PAGE_SIZE)
>  		pages = SIZE_MAX;
>  	else
>  		pages = howmany(size_max, PAGE_SIZE);
> %%%
> 
> -- 
> Jaakko
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"