Index: sys/netpfil/pf/pf.c
===================================================================
--- sys/netpfil/pf/pf.c
+++ sys/netpfil/pf/pf.c
@@ -5522,10 +5522,18 @@
 	}
 
 	if (r->rt == PF_DUPTO) {
-		if ((m0 = m_dup(*m, M_NOWAIT)) == NULL) {
-			if (s)
-				PF_STATE_UNLOCK(s);
-			return;
+		if(pd->pf_mtag->flags & PF_DUPLICATED) {
+			m0 = *m;
+			goto bad_locked;
+		} else if (oifp->if_index == s->rt_kif->pfik_ifp->if_index) {
+			pd->pf_mtag->flags |= PF_DUPLICATED;
+			m0 = *m;
+		} else {
+			if ((m0 = m_dup(*m, M_NOWAIT)) == NULL) {
+				m0 = *m;
+				*m = NULL;
+				goto bad_locked;
+			}
 		}
 	} else {
 		if ((r->rt == PF_REPLYTO) == (r->direction == dir)) {
@@ -5645,7 +5653,7 @@
 		KMOD_IPSTAT_INC(ips_fragmented);
 
 done:
-	if (r->rt != PF_DUPTO)
+	if ((r->rt != PF_DUPTO) || (pd->pf_mtag->flags & PF_DUPLICATED))
 		*m = NULL;
 	return;
 
@@ -5683,10 +5691,18 @@
 	}
 
 	if (r->rt == PF_DUPTO) {
-		if ((m0 = m_dup(*m, M_NOWAIT)) == NULL) {
-			if (s)
-				PF_STATE_UNLOCK(s);
-			return;
+		if(pd->pf_mtag->flags & PF_DUPLICATED) {
+			m0 = *m;
+			goto bad_locked;
+		} else if (oifp->if_index == s->rt_kif->pfik_ifp->if_index) {
+			pd->pf_mtag->flags |= PF_DUPLICATED;
+			m0 = *m;
+		} else {
+			if ((m0 = m_dup(*m, M_NOWAIT)) == NULL) {
+				m0 = *m;
+				*m = NULL;
+				goto bad_locked;
+			}
 		}
 	} else {
 		if ((r->rt == PF_REPLYTO) == (r->direction == dir)) {
@@ -5772,7 +5788,7 @@
 	}
 
 done:
-	if (r->rt != PF_DUPTO)
+	if ((r->rt != PF_DUPTO) || (pd->pf_mtag->flags & PF_DUPLICATED))
 		*m = NULL;
 	return;
 
Index: sys/netpfil/pf/pf_mtag.h
===================================================================
--- sys/netpfil/pf/pf_mtag.h
+++ sys/netpfil/pf/pf_mtag.h
@@ -42,6 +42,7 @@
 #define	PF_PACKET_LOOPED		0x08
 #define	PF_FASTFWD_OURS_PRESENT		0x10
 #define	PF_REASSEMBLED			0x20
+#define	PF_DUPLICATED			0x40
 
 struct pf_mtag {
 	void		*hdr;		/* saved hdr pos in mbuf, for ECN */