[src/netbsd-7]: src/sys/ufs/ffs Pull up following revision(s) (requested by m...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d17489f100bd
branches:  netbsd-7
changeset: 798749:d17489f100bd
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Dec 29 16:28:14 2014 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #352):
        sys/ufs/ffs/ffs_vfsops.c: revision 1.301
Limit the superblock size to SBLOCKSIZE, not MAXBSIZE. Otherwise memcpy
will read beyond the allocated buffer.
Discussed a bit on tech-kern@.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 535c88d4c09d -r d17489f100bd sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Dec 29 16:25:28 2014 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Mon Dec 29 16:28:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.299.2.1 2014/11/18 18:40:06 snj Exp $ */
+/*     $NetBSD: ffs_vfsops.c,v 1.299.2.2 2014/12/29 16:28:14 martin Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.299.2.1 2014/11/18 18:40:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.299.2.2 2014/12/29 16:28:14 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -974,7 +974,7 @@
                        continue;
 
                /* Validate size of superblock */
-               if (sbsize > MAXBSIZE || sbsize < sizeof(struct fs))
+               if (sbsize > SBLOCKSIZE || sbsize < sizeof(struct fs))
                        continue;
 
                /* Check that we can handle the file system blocksize */