diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2026-07-29 18:45:36 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2026-07-29 19:30:37 +0000 |
| commit | 815976ee14121bafe8a8ab002459d32f8928f2de (patch) | |
| tree | e484a3b9dba994f583e871b178fbe0275b205ca9 | |
| parent | 248d537e4ca7295a08bab60e82633d332d36e525 (diff) | |
ktls: Propagate EPG_FLAG_ANON to mapped mbufs
Otherwise ktls_mbuf_crypto_state() will reject mbufs created by
_mb_unmapped_to_ext(), which arises when transmitting packets through an
interface that doesn't support unmapped mbufs, and the loopback
interface in particular.
PR: 296498
Fixes: 3444414cb463 ("ktls: Don't attempt to modify non-anonymous mbufs on the receive path")
Reviewed by: gallatin, jhb
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D57557
| -rw-r--r-- | sys/kern/kern_mbuf.c | 3 | ||||
| -rw-r--r-- | sys/kern/uipc_ktls.c | 3 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 9144366a9ff3..f76bf08fc438 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -1022,6 +1022,9 @@ _mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) m_extadd(m_new, sf_buf_kva(sf), PAGE_SIZE, mb_unmapped_free_mext, sf, mref, m->m_flags & M_RDONLY, EXT_SFBUF); + m_new->m_ext.ext_flags |= + (m->m_epg_flags & EPG_FLAG_ANON) != 0 ? + EXT_FLAG_SFBUF_ANON : 0; m_new->m_data += segoff; m_new->m_len = seglen; diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 0966c930ca0f..2cf6b5f1fa53 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2423,7 +2423,8 @@ ktls_mbuf_crypto_state(struct mbuf *mb) (mb->m_epg_flags & EPG_FLAG_ANON) == 0) return (KTLS_MBUF_CRYPTO_ST_SHAREDMBUF); if ((mb->m_flags & M_EXT) != 0 && - mb->m_ext.ext_type == EXT_SFBUF) + mb->m_ext.ext_type == EXT_SFBUF && + (mb->m_ext.ext_flags & EXT_FLAG_SFBUF_ANON) == 0) return (KTLS_MBUF_CRYPTO_ST_SHAREDMBUF); if (mb->m_flags & M_DECRYPTED) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index d812d66eb5eb..05fd522b7618 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -621,6 +621,7 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) */ #define EXT_FLAG_EMBREF 0x000001 /* embedded ext_count */ #define EXT_FLAG_EXTREF 0x000002 /* external ext_cnt, notyet */ +#define EXT_FLAG_SFBUF_ANON 0x000004 /* sendfile buffer is mutable */ #define EXT_FLAG_NOFREE 0x000010 /* don't free mbuf to pool, notyet */ |