Thu Jan 12 14:24:53 2017 UTC ()

Fix the possibility of off-by-one on the grammer.  Reported by coypu.
Currently it never happens because type is (minor number % 7) and
the arraycount of fd_types[] is 8.  I.e., it is a dead code...
However, when the capacity of the FDTYPE() changes or the arraycount
of fd_types[] changes, this correction will be effective.


(isaki)

diff -r1.118 -r1.119 src/sys/arch/x68k/dev/fd.c

--- src/sys/arch/x68k/dev/fd.c 2015/07/11 10:32:46	1.118
+++ src/sys/arch/x68k/dev/fd.c 2017/01/12 14:24:53	1.119

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fd.c,v 1.118 2015/07/11 10:32:46 kamil Exp $	*/
+/*	$NetBSD: fd.c,v 1.119 2017/01/12 14:24:53 isaki Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and Minoura Makoto.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -54,27 +54,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fd.c	7.4 (Berkeley) 5/25/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.118 2015/07/11 10:32:46 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.119 2017/01/12 14:24:53 isaki Exp $");
 #include "opt_ddb.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 @@ -662,27 +662,27 @@ fdattach(device_t parent, device_t self,
 	 * with RB_ASKNAME and get selected as the boot device.
 	 */
 	mountroothook_establish(fd_mountroot_hook, fd->sc_dev);
 	rnd_attach_source(&fd->rnd_source, device_xname(fd->sc_dev),
 	    RND_TYPE_DISK, RND_FLAG_DEFAULT);
+}
 struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
+{
 	size_t type = FDTYPE(dev);
-	if (type > __arraycount(fd_types))
+	if (type >= __arraycount(fd_types))
 		return NULL;
 	return &fd_types[type];
+}
 void
 fdstrategy(struct buf *bp)
+{
 	struct fd_softc *fd;
 	int unit;
 	int sz;
 	int s;
 	unit = FDUNIT(bp->b_dev);