[src/trunk]: src/sys/external/bsd/ipf/netinet PR/55149: Kouichi Hashikawa: Ge...

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

details:   https://anonhg.NetBSD.org/src/rev/2769ba181ba4
branches:  trunk
changeset: 1009018:2769ba181ba4
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Apr 09 18:20:40 2020 +0000

description:
PR/55149: Kouichi Hashikawa: Get morefrag before we strip it out from off

diffstat:

 sys/external/bsd/ipf/netinet/fil.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r bd276b83d880 -r 2769ba181ba4 sys/external/bsd/ipf/netinet/fil.c
--- a/sys/external/bsd/ipf/netinet/fil.c        Thu Apr 09 16:12:28 2020 +0000
+++ b/sys/external/bsd/ipf/netinet/fil.c        Thu Apr 09 18:20:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fil.c,v 1.32 2020/04/05 02:50:27 christos Exp $        */
+/*     $NetBSD: fil.c,v 1.33 2020/04/09 18:20:40 christos Exp $        */
 
 /*
  * Copyright (C) 2012 by Darren Reed.
@@ -141,7 +141,7 @@
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.32 2020/04/05 02:50:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.33 2020/04/09 18:20:40 christos Exp $");
 #else
 static const char sccsid[] = "@(#)fil.c        1.36 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $";
@@ -1724,11 +1724,10 @@
         */
        off &= IP_MF|IP_OFFMASK;
        if (off != 0) {
+               int morefrag = off & IP_MF;
                fi->fi_flx |= FI_FRAG;
                off &= IP_OFFMASK;
                if (off != 0) {
-                       int morefrag = off & IP_MF;
-
                        if (off == 1 && p == IPPROTO_TCP) {
                                fin->fin_flx |= FI_SHORT;       /* RFC 3128 */
                                DT1(ipf_fi_tcp_frag_off_1, fr_info_t *, fin);