Author: glebius
Date: Wed Mar 21 07:29:47 2012
New Revision: 233266
URL: http://svn.freebsd.org/changeset/base/233266
Log:
Merge 228321 from head:
Fix double free.
PR: kern/163089
Submitted by: Herbie Robinson <Herbie.Robinson stratus.com>
Modified:
stable/9/sys/netinet6/mld6.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/i386/conf/XENHVM (props changed)
Modified: stable/9/sys/netinet6/mld6.c
==============================================================================
--- stable/9/sys/netinet6/mld6.c Wed Mar 21 07:22:27 2012
(r233265)
+++ stable/9/sys/netinet6/mld6.c Wed Mar 21 07:29:47 2012
(r233266)
@@ -3096,7 +3096,6 @@ mld_dispatch_packet(struct mbuf *m)
m0 = mld_v2_encap_report(ifp, m);
if (m0 == NULL) {
CTR2(KTR_MLD, "%s: dropped %p", __func__, m);
- m_freem(m);
IP6STAT_INC(ip6s_odropped);
goto out;
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
