[src/netbsd-6]: src/sys Pull up following revision(s) (requested by spz in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/05da2ef68168
branches:  netbsd-6
changeset: 777167:05da2ef68168
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jun 15 06:04:01 2017 +0000

description:
Pull up following revision(s) (requested by spz in ticket #1456):
        sys/arch/ews4800mips/sbd/fb_sbdio.c: revision 1.16
        sys/arch/pmax/ibus/pm.c: revision 1.13
        sys/dev/hpc/bivideo.c: revision 1.34
        sys/dev/ic/sti.c: revision 1.19
correct size checks so they cannot be circumvented by integer overflows
reported by CTurt, thanks for the notification

diffstat:

 sys/arch/ews4800mips/sbd/fb_sbdio.c |  8 ++++++--
 sys/arch/pmax/ibus/pm.c             |  8 ++++----
 sys/dev/hpc/bivideo.c               |  8 ++++----
 sys/dev/ic/sti.c                    |  8 ++++----
 4 files changed, 18 insertions(+), 14 deletions(-)

diffs (137 lines):

diff -r 8586cefd381c -r 05da2ef68168 sys/arch/ews4800mips/sbd/fb_sbdio.c
--- a/sys/arch/ews4800mips/sbd/fb_sbdio.c       Sat Jun 03 17:26:55 2017 +0000
+++ b/sys/arch/ews4800mips/sbd/fb_sbdio.c       Thu Jun 15 06:04:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $   */
+/*     $NetBSD: fb_sbdio.c,v 1.12.2.1 2017/06/15 06:04:01 snj Exp $    */
 
 /*-
  * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define WIRED_FB_TLB
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.12 2012/01/11 21:17:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb_sbdio.c,v 1.12.2.1 2017/06/15 06:04:01 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -304,6 +304,8 @@
                if (ri->ri_flg == RI_FORCEMONO)
                        break;
                ga_clut_get(ga);
+               if (cmap->index >= 256 || cmap->count > 256 - cmap->index)
+                       return (EINVAL);
                for (i = 0; i < cmap->count; i++) {
                        cmap->red[i] = ga->clut[cmap->index + i][0];
                        cmap->green[i] = ga->clut[cmap->index + i][1];
@@ -314,6 +316,8 @@
        case WSDISPLAYIO_PUTCMAP:
                if (ri->ri_flg == RI_FORCEMONO)
                        break;
+               if (cmap->index >= 256 || cmap->count > 256 - cmap->index)
+                       return (EINVAL);
                for (i = 0; i < cmap->count; i++) {
                        ga->clut[cmap->index + i][0] = cmap->red[i];
                        ga->clut[cmap->index + i][1] = cmap->green[i];
diff -r 8586cefd381c -r 05da2ef68168 sys/arch/pmax/ibus/pm.c
--- a/sys/arch/pmax/ibus/pm.c   Sat Jun 03 17:26:55 2017 +0000
+++ b/sys/arch/pmax/ibus/pm.c   Thu Jun 15 06:04:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $ */
+/*     $NetBSD: pm.c,v 1.11.2.1 2017/06/15 06:04:01 snj Exp $  */
 
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.11 2012/01/11 21:17:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm.c,v 1.11.2.1 2017/06/15 06:04:01 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -668,7 +668,7 @@
        index = p->index;
        count = p->count;
 
-       if (index >= sc->sc_cmap_size || (index + count) > sc->sc_cmap_size)
+       if (index >= sc->sc_cmap_size || count > sc->sc_cmap_size - index)
                return (EINVAL);
 
        if ((rv = copyout(&sc->sc_cmap.r[index], p->red, count)) != 0)
@@ -687,7 +687,7 @@
        index = p->index;
        count = p->count;
 
-       if (index >= sc->sc_cmap_size || (index + count) > sc->sc_cmap_size)
+       if (index >= sc->sc_cmap_size || count > sc->sc_cmap_size - index)
                return (EINVAL);
 
        if ((rv = copyin(p->red, &sc->sc_cmap.r[index], count)) != 0)
diff -r 8586cefd381c -r 05da2ef68168 sys/dev/hpc/bivideo.c
--- a/sys/dev/hpc/bivideo.c     Sat Jun 03 17:26:55 2017 +0000
+++ b/sys/dev/hpc/bivideo.c     Thu Jun 15 06:04:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bivideo.c,v 1.32 2010/11/13 13:51:58 uebayasi Exp $    */
+/*     $NetBSD: bivideo.c,v 1.32.14.1 2017/06/15 06:04:01 snj Exp $    */
 
 /*-
  * Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.32 2010/11/13 13:51:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.32.14.1 2017/06/15 06:04:01 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcfb.h"
@@ -403,8 +403,8 @@
 
                if (sc->sc_fbconf.hf_class != HPCFB_CLASS_INDEXCOLOR ||
                    sc->sc_fbconf.hf_pack_width != 8 ||
-                   256 <= cmap->index ||
-                   256 < (cmap->index + cmap->count))
+                   cmap->index >= 256 ||
+                   cmap->count > 256 - cmap->index)
                        return (EINVAL);
 
                error = copyout(&bivideo_cmap_r[cmap->index], cmap->red,
diff -r 8586cefd381c -r 05da2ef68168 sys/dev/ic/sti.c
--- a/sys/dev/ic/sti.c  Sat Jun 03 17:26:55 2017 +0000
+++ b/sys/dev/ic/sti.c  Thu Jun 15 06:04:01 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sti.c,v 1.16.8.1 2014/05/21 20:56:36 bouyer Exp $      */
+/*     $NetBSD: sti.c,v 1.16.8.2 2017/06/15 06:04:01 snj Exp $ */
 
 /*     $OpenBSD: sti.c,v 1.61 2009/09/05 14:09:35 miod Exp $   */
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.16.8.1 2014/05/21 20:56:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.16.8.2 2017/06/15 06:04:01 snj Exp $");
 
 #include "wsdisplay.h"
 
@@ -1025,7 +1025,7 @@
                cmapp = (struct wsdisplay_cmap *)data;
                idx = cmapp->index;
                count = cmapp->count;
-               if (idx >= STI_NCMAP || idx + count > STI_NCMAP)
+               if (idx >= STI_NCMAP || count > STI_NCMAP - idx)
                        return EINVAL;
                if ((ret = copyout(&scr->scr_rcmap[idx], cmapp->red, count)))
                        break;
@@ -1041,7 +1041,7 @@
                cmapp = (struct wsdisplay_cmap *)data;
                idx = cmapp->index;
                count = cmapp->count;
-               if (idx >= STI_NCMAP || idx + count > STI_NCMAP)
+               if (idx >= STI_NCMAP || count > STI_NCMAP - idx)
                        return EINVAL;
                if ((ret = copyin(cmapp->red, &scr->scr_rcmap[idx], count)))
                        break;