[src/netbsd-8]: src/sys/netinet6 Pull up following revision(s) (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/fa9a6ae1e626
branches:  netbsd-8
changeset: 434794:fa9a6ae1e626
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Mar 30 11:57:13 2018 +0000

description:
Pull up following revision(s) (requested by maxv in ticket #671):

        sys/netinet6/ip6_forward.c: revision 1.91

Fix two pretty bad mistakes. If ipsec6_check_policy fails m is not freed,
and a 'goto out' is missing after ipsec6_process_packet.

diffstat:

 sys/netinet6/ip6_forward.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r fa600b12f56c -r fa9a6ae1e626 sys/netinet6/ip6_forward.c
--- a/sys/netinet6/ip6_forward.c        Fri Mar 30 11:53:13 2018 +0000
+++ b/sys/netinet6/ip6_forward.c        Fri Mar 30 11:57:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $ */
+/*     $NetBSD: ip6_forward.c,v 1.87.2.3 2018/03/30 11:57:13 martin Exp $      */
 /*     $KAME: ip6_forward.c,v 1.109 2002/09/11 08:10:17 sakane Exp $   */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.2 2018/01/09 19:30:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_forward.c,v 1.87.2.3 2018/03/30 11:57:13 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -197,6 +197,7 @@
                         */
                        if (error == -EINVAL)
                                error = 0;
+                       m_freem(m);
                        goto freecopy;
                }
        }
@@ -268,8 +269,10 @@
                int s = splsoftnet();
                error = ipsec6_process_packet(m, sp->req);
                splx(s);
+               /* m is freed */
                if (mcopy)
                        goto freecopy;
+               goto out;
        }
 #endif