Module Name: src
Committed By: christos
Date: Tue Jul 15 11:43:54 UTC 2014
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Correct the bread size of struct fsinfo from Gerald Lee at DELL dot com
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/fs/msdosfs/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.112 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.113
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.112 Wed Jul 9 05:00:18 2014
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Tue Jul 15 07:43:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.113 2014/07/15 11:43:54 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.112 2014/07/09 09:00:18 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.113 2014/07/15 11:43:54 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -741,6 +741,7 @@ msdosfs_mountfs(struct vnode *devvp, str
*/
if (pmp->pm_fsinfo) {
struct fsinfo *fp;
+ const int rdsz = roundup(sizeof(*fp), pmp->pm_BytesPerSec);
/*
* XXX If the fsinfo block is stored on media with
@@ -748,7 +749,7 @@ msdosfs_mountfs(struct vnode *devvp, str
* padded at the end or in the middle?
*/
if ((error = bread(devvp, de_bn2kb(pmp, pmp->pm_fsinfo),
- pmp->pm_BytesPerSec, NOCRED, 0, &bp)) != 0)
+ rdsz, NOCRED, 0, &bp)) != 0)
goto error_exit;
fp = (struct fsinfo *)bp->b_data;
if (!memcmp(fp->fsisig1, "RRaA", 4)
