From nobody Thu Feb 10 15:16:58 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA1C819C32D8; Thu, 10 Feb 2022 15:17:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvgMc3BLqz3jll; Thu, 10 Feb 2022 15:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644506221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MmeCzQSw7I2WqRbG4+G2G4NGBwFHEn14oMdFa2T8io=; b=AfcxPSpucbvLblE/SVc2kXOo3TKU6XvmsUtZPzkb1I6GfhVSVHelokpDUUELrLBRGzY4xJ 6F748s0Aiv3OBbfTzODNQYQFXVjSyK4MAGAb+CkEmgYLyvc7kRCM3ZS1kDAuf5rI9O8vie l4lcI0pvN7RO+TT95ySviEZ0xiEvoJADIGfdUOM+Csbpk6J0S1ksRxMOVtjXR8+aDSgsP2 YGB55+uRrlZ0lyS0xrbVYt8d2ChXDZEYOn7VWK4tke7NN1PHnSQeYrwn+tc2RYNE1D0kko FQnNchcrE/7a4Az5MjBDLmkIC+aFrgJIq1dHM0HeVLb7rs499f2b/c6y5zzrYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7556226EB; Thu, 10 Feb 2022 15:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21AFGwH7071416; Thu, 10 Feb 2022 15:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21AFGw0e071415; Thu, 10 Feb 2022 15:16:58 GMT (envelope-from git) Date: Thu, 10 Feb 2022 15:16:58 GMT Message-Id: <202202101516.21AFGw0e071415@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 22ba29707664 - stable/13 - mbuf(9): Assert receive mbufs don't carry a send tag. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 22ba297076646544a51c888589fa87e373c78bbf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644506221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MmeCzQSw7I2WqRbG4+G2G4NGBwFHEn14oMdFa2T8io=; b=oMqVK69daHgi8JrYrjhUZ4iLqOkW8bQmQszYCjJ3S/QzBV1MbYhUHd9gafEhnLBhL1bOPh G7rMN3mvVGWlbV1PUQ02vwBXsa87E+6I0fv2ik/R7tpIIXSovxCODDS3BxqtYoBC9/ox+5 kgQt1EVTIEIDWE5e1wCqp1wi7gkEz+6hspzaoyd5MkNz+dbvtO6ynJ1rT6e0btO5Ex/BAz ZTRyympcxz0jPiX2HWHnImf7gQcFzc29W7ilGZKxuSpDXmOlmdbGeJQicgfT1mGp0bVPUU 1pGd1XnRRMdR8ngv2zFv1ICcdXTe9zdKXZdyIRofUPI70ygWS9c8GrMxhPXp/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644506221; a=rsa-sha256; cv=none; b=u0p5oVwYttfGedacCdxDbTtdIbamppRsU5pL7oDZDxpw1JG7ggkzoLl7Fl7Z9kl5puGjNA LziSSs2vEhliYqGZAMp8OvF35Gu+5qNssVcnEDLz4GyxrY8/4oszFXQD2g094ZF3oT80T5 zE9K9dID8XRg5mWteMx8EleumjiKJRIpdbw9HteMWxnERHJWtic8//cNzTlG6NP0HT4/Wt 6qgklKTPDRRd4PElr1+sHRyGofIJQkksmYPPSNwYHPZLYiAkRqdkw/FhPdKFIiz6ON9wt5 0uUeqOQuxV3nL8G06/+iKyl8IDNfhlhaTf6n5TK4bX45a5+kttRwuEI5jfjzyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=22ba297076646544a51c888589fa87e373c78bbf commit 22ba297076646544a51c888589fa87e373c78bbf Author: Hans Petter Selasky AuthorDate: 2022-01-26 11:13:53 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-10 15:11:22 +0000 mbuf(9): Assert receive mbufs don't carry a send tag. Else we would start leaking reference counts. Discussed with: jhb@ Sponsored by: NVIDIA Networking (cherry picked from commit 17cbcf33c3b6d0361d71bdb00b8633ec9bb5ae53) --- sys/kern/uipc_mbuf.c | 1 + sys/kern/uipc_sockbuf.c | 1 + sys/sys/mbuf.h | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index d78bddb284f4..13c98d0895fa 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -253,6 +253,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 dac06069c65a..427c6c9b36e5 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1109,6 +1109,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, \