[src/netbsd-9]: src/sys/netinet Pull up following revision(s) (requested by k...

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

details:   https://anonhg.NetBSD.org/src/rev/41e1ab00985f
branches:  netbsd-9
changeset: 843792:41e1ab00985f
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jan 23 10:14:30 2020 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #644):

        sys/netinet/ip_encap.c: revision 1.72

Fix PR security/54881.  Pointed out by ohishi@IIJ, thanks.

diffstat:

 sys/netinet/ip_encap.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 4321ce0ac9c1 -r 41e1ab00985f sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Thu Jan 23 10:10:57 2020 +0000
+++ b/sys/netinet/ip_encap.c    Thu Jan 23 10:14:30 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.c,v 1.71 2019/05/15 03:33:41 knakahara Exp $  */
+/*     $NetBSD: ip_encap.c,v 1.71.2.1 2020/01/23 10:14:30 martin Exp $ */
 /*     $KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $       */
 
 /*
@@ -68,7 +68,7 @@
 #define USE_RADIX
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.71 2019/05/15 03:33:41 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.71.2.1 2020/01/23 10:14:30 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -884,10 +884,11 @@
                        */
                        match = encap6_lookup(m, off, nxt, OUTBOUND,
                            &elem_psref);
-                       if (match)
+                       if (match) {
                                valid++;
-                       psref_release(&elem_psref, &match->psref,
-                           encaptab.elem_class);
+                               psref_release(&elem_psref, &match->psref,
+                                   encaptab.elem_class);
+                       }
 
                        /*
                        * Depending on the value of "valid" and routing table