diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2022-01-26 11:13:53 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2022-01-26 11:55:00 +0000 |
| commit | 17cbcf33c3b6d0361d71bdb00b8633ec9bb5ae53 (patch) | |
| tree | 8f188c48e424ce37723010c63f36b54fa9af53b0 | |
| parent | a6d45243233ccd26940df7fed127357cdc2d6b75 (diff) | |
| download | src-17cbcf33c3b6d0361d71bdb00b8633ec9bb5ae53.tar.gz src-17cbcf33c3b6d0361d71bdb00b8633ec9bb5ae53.zip | |
mbuf(9): Assert receive mbufs don't carry a send tag.
Else we would start leaking reference counts.
Discussed with: jhb@
MFC after: 1 week
Sponsored by: NVIDIA Networking
| -rw-r--r-- | sys/kern/uipc_mbuf.c | 1 | ||||
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 1 | ||||
| -rw-r--r-- | sys/sys/mbuf.h | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 42c94ae4a355..dab068894f54 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -263,6 +263,7 @@ m_demote_pkthdr(struct mbuf *m) { M_ASSERTPKTHDR(m); + M_ASSERT_NO_SND_TAG(m); m_tag_delete_chain(m, NULL); m->m_flags &= ~M_PKTHDR; diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index d4db19598392..80505dd4dbd2 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -1144,6 +1144,7 @@ sbappendaddr_locked_internal(struct sockbuf *sb, const struct sockaddr *asa, m->m_len = asa->sa_len; bcopy(asa, mtod(m, caddr_t), asa->sa_len); if (m0) { + M_ASSERT_NO_SND_TAG(m0); m_clrprotoflags(m0); m_tag_delete_chain(m0, NULL); /* diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 51dac927e421..77364f428b12 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1139,6 +1139,12 @@ m_extrefcnt(struct mbuf *m) KASSERT((m) != NULL && (m)->m_flags & M_PKTHDR, \ ("%s: no mbuf packet header!", __func__)) +/* Check if the supplied mbuf has no send tag, or else panic. */ +#define M_ASSERT_NO_SND_TAG(m) \ + KASSERT((m) == NULL || ((m)->m_flags & M_PKTHDR) == 0 || \ + ((m)->m_pkthdr.csum_flags & CSUM_SND_TAG) == 0, \ + ("%s: receive mbuf has send tag!", __func__)) + /* Check if mbuf is multipage. */ #define M_ASSERTEXTPG(m) \ KASSERT(((m)->m_flags & (M_EXTPG|M_PKTHDR)) == M_EXTPG, \ |