summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-08 14:41:31 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-08 14:41:31 +0000
commit504420ae733837fedf13f692328b9566a3420362 (patch)
tree8db26b90f8a55e6f70a9ad3b694a9edd8dcc8a24 /sys/dev
parent9b58256c90b2119530e0b7e88ab0981a575611c3 (diff)
Fix a use-after-free, from Maxime Villard w/ Brainy.
ok jsg@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_et.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 6c7e56470e5..e8e32e346a0 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_et.c,v 1.28 2015/06/24 09:40:54 mpi Exp $ */
+/* $OpenBSD: if_et.c,v 1.29 2015/07/08 14:41:30 mpi Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
@@ -1806,7 +1806,6 @@ et_encap(struct et_softc *sc, struct mbuf **m0)
}
if (error) { /* error == EFBIG */
if (m_defrag(m, M_DONTWAIT)) {
- m_freem(m);
printf("%s: can't defrag TX mbuf\n",
sc->sc_dev.dv_xname);
error = ENOBUFS;