Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet Don't free memory still in use. Fixes nfs root ...



details:   https://anonhg.NetBSD.org/src/rev/919d8f5fd0b9
branches:  trunk
changeset: 757946:919d8f5fd0b9
user:      enami <enami%NetBSD.org@localhost>
date:      Wed Oct 06 07:39:37 2010 +0000

description:
Don't free memory still in use.  Fixes nfs root problem reported
by Christoph Egger on source-changes-d.

diffstat:

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

diffs (34 lines):

diff -r 1a97492e05e2 -r 919d8f5fd0b9 sys/netinet/ip_reass.c
--- a/sys/netinet/ip_reass.c    Wed Oct 06 06:43:26 2010 +0000
+++ b/sys/netinet/ip_reass.c    Wed Oct 06 07:39:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_reass.c,v 1.4 2010/10/03 19:44:47 rmind Exp $       */
+/*     $NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1993
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.4 2010/10/03 19:44:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_reass.c,v 1.5 2010/10/06 07:39:37 enami Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -390,7 +390,6 @@
                pool_cache_put(ipfren_cache, q);
                m_cat(m, t);
        }
-       free(fp, M_FTABLE);
 
        /*
         * Create header for new packet by modifying header of first
@@ -400,6 +399,7 @@
        ip->ip_len = htons((ip->ip_hl << 2) + next);
        ip->ip_src = fp->ipq_src;
        ip->ip_dst = fp->ipq_dst;
+       free(fp, M_FTABLE);
 
        m->m_len += (ip->ip_hl << 2);
        m->m_data -= (ip->ip_hl << 2);



Home | Main Index | Thread Index | Old Index