The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1bb7c45c532f3de76120db05739ac4ee34403091

commit 1bb7c45c532f3de76120db05739ac4ee34403091
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2021-03-08 17:56:14 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2021-03-08 17:56:14 +0000

    wg: Fix a mismerge
    
    df55485085 fixed a leak that I had initially fixed in a11009dccb.
    
    Fixes:  a11009dccb
---
 sys/dev/if_wg/module/if_wg_session.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys/dev/if_wg/module/if_wg_session.c 
b/sys/dev/if_wg/module/if_wg_session.c
index 75baae063428..e63367785ed3 100644
--- a/sys/dev/if_wg/module/if_wg_session.c
+++ b/sys/dev/if_wg/module/if_wg_session.c
@@ -1911,7 +1911,6 @@ wg_input(struct mbuf *m0, int offset, struct inpcb *inpcb,
         */
        if ((m = m_pullup(m0, m0->m_pkthdr.len)) == NULL) {
                DPRINTF(sc, "DEFRAG fail\n");
-               m_freem(m0);
                return;
        }
        data = mtod(m, void *);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to