[src/trunk]: src/sys/arch/i386/stand/boot PR/50748: David Binderman: check bo...

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

details:   https://anonhg.NetBSD.org/src/rev/29d3ec435fc2
branches:  trunk
changeset: 813566:29d3ec435fc2
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Feb 03 05:27:53 2016 +0000

description:
PR/50748: David Binderman: check bounds before dereference

diffstat:

 sys/arch/i386/stand/boot/boot2.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r c9311a456b7b -r 29d3ec435fc2 sys/arch/i386/stand/boot/boot2.c
--- a/sys/arch/i386/stand/boot/boot2.c  Wed Feb 03 05:26:16 2016 +0000
+++ b/sys/arch/i386/stand/boot/boot2.c  Wed Feb 03 05:27:53 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot2.c,v 1.65 2015/06/11 15:56:53 khorben Exp $       */
+/*     $NetBSD: boot2.c,v 1.66 2016/02/03 05:27:53 christos Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -266,8 +266,8 @@
 #ifndef SMALL
        int n;
        if (bootcfg_info.banner[0]) {
-               for (n = 0; bootcfg_info.banner[n]
-                   && n < BOOTCFG_MAXBANNER; n++) 
+               for (n = 0; n < BOOTCFG_MAXBANNER && bootcfg_info.banner[n];
+                   n++) 
                        printf("%s\n", bootcfg_info.banner[n]);
        } else {
 #endif /* !SMALL */