[src/netbsd-6-0]: src/sys/dist/pf/net Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/9cbbc670a6f9
branches:  netbsd-6-0
changeset: 775295:9cbbc670a6f9
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Feb 10 04:25:34 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #1527):
        sys/dist/pf/net/pf.c: revision 1.78 via patch
Oh, what is this. Fix a remotely-triggerable integer overflow: the way we
define TCPOLEN_SACK makes it unsigned, and the comparison in the while()
is unsigned too. That's not the expected behavior, the original code
wanted a signed comparison.
It's pretty easy to make 'hlen' go negative and trigger a buffer overflow.
This bug was reported 8 years ago by Lucio Albornoz in PR/44059.

diffstat:

 sys/dist/pf/net/pf.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 19362dc30072 -r 9cbbc670a6f9 sys/dist/pf/net/pf.c
--- a/sys/dist/pf/net/pf.c      Fri Feb 09 14:12:55 2018 +0000
+++ b/sys/dist/pf/net/pf.c      Sat Feb 10 04:25:34 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $ */
+/*     $NetBSD: pf.c,v 1.68.6.1 2018/02/10 04:25:34 snj Exp $  */
 /*     $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
 
 /*
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.68 2011/12/19 16:10:07 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf.c,v 1.68.6.1 2018/02/10 04:25:34 snj Exp $");
 
 #include "pflog.h"
 
@@ -1590,7 +1590,7 @@
        struct sackblk sack;
 
 #ifdef __NetBSD__
-#define        TCPOLEN_SACK (2 * sizeof(uint32_t))
+#define        TCPOLEN_SACK            8               /* 2*sizeof(tcp_seq) */
 #endif
 
 #define TCPOLEN_SACKLEN        (TCPOLEN_SACK + 2)