[src/netbsd-3-0]: src/sys/netinet6 Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/beef9710ab9b
branches:  netbsd-3-0
changeset: 579464:beef9710ab9b
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Thu Nov 22 19:06:27 2007 +0000

description:
Pull up following revision(s) (requested by jdc in ticket #1879):
        sys/netinet6/ipcomp_input.c: revision 1.28
>From FreeBSD:
    In ipcomp6_input(), check 'md' not 'm' after a call to m_pulldown(): 'm'
    may be a stale pointer at this point, and we're interested in whether or
    not m_pulldown() failed.
    Noticed by:     Coverity Prevent analysis tool

diffstat:

 sys/netinet6/ipcomp_input.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 93fb2bdcef45 -r beef9710ab9b sys/netinet6/ipcomp_input.c
--- a/sys/netinet6/ipcomp_input.c       Thu Nov 22 19:01:36 2007 +0000
+++ b/sys/netinet6/ipcomp_input.c       Thu Nov 22 19:06:27 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipcomp_input.c,v 1.22.14.2 2005/07/18 21:06:51 riz Exp $       */
+/*     $NetBSD: ipcomp_input.c,v 1.22.14.2.2.1 2007/11/22 19:06:27 bouyer Exp $        */
 /*     $KAME: ipcomp_input.c,v 1.29 2001/09/04 08:43:19 itojun Exp $   */
 
 /*
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.22.14.2 2005/07/18 21:06:51 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipcomp_input.c,v 1.22.14.2.2.1 2007/11/22 19:06:27 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -267,7 +267,7 @@
        off = *offp;
 
        md = m_pulldown(m, off, sizeof(*ipcomp), NULL);
-       if (!m) {
+       if (!md) {
                m = NULL;       /* already freed */
                ipseclog((LOG_DEBUG, "IPv6 IPComp input: assumption failed "
                    "(pulldown failure)\n"));