The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71776d67198fadd7d96937c9bdd22063636b132b
commit 71776d67198fadd7d96937c9bdd22063636b132b Author: Mark Johnston <[email protected]> AuthorDate: 2021-05-26 13:49:49 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2021-05-26 14:42:36 +0000 oce: Fix handling of m_pullup() errors in oce_tso_setup() m_pullup() frees the input mbuf chain upon a failure. Set *mpp to NULL in this case to ensure that the caller does not free the chain again. PR: 224928 Submitted by: Lv Yunlong <[email protected]> (original version) MFC after: 1 week --- sys/dev/oce/oce_if.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index 7c9b71089081..271c35015a9f 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -1330,11 +1330,8 @@ oce_tso_setup(POCE_SOFTC sc, struct mbuf **mpp) } m = m_pullup(m, total_len); - if (!m) - return NULL; *mpp = m; return m; - } #endif /* INET6 || INET */ _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
