From nobody Fri Feb 25 09:58:22 2022 X-Original-To: dev-commits-src-all@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 4AEFF19DFD66; Fri, 25 Feb 2022 09:58:23 +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 4K4lb31RgMz4mpB; Fri, 25 Feb 2022 09:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645783103; 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=ia7SMCBg97Gy94g+43h3o6luhMSoI00mQim0yzwxYNk=; b=vhWVOyGyKOTDwwbyq+MPg86UkGZ5gG6GB+BuAX5cY6hNlbaXu5riRwUZu9ojtVD1ZDE/3/ N8zPgRW2noY6VgbK+Jh6oJTx8cuHxdQZVAlufe+fRgW+XlIxLQLeX1Ah5d3jrUcgjaRB2k uU2Oldtw9FhgpEGkP55U6aswULKcdKKQw2Wupi/PLaqOB4TjlWZMwcDEW0tEkZCGJHoBE7 MK+bxzVmP+YzBzUYSNnmAu+J7bhix0uPAtWBHvA772h5kT+QTqYDUev0iy5yhxI0IbwFOG X1nD83C8kWyIjT/sla9hgLGHlhVb+ZYFTR2sc2D3fCj8T+cIM03yfAFOm8C/lQ== 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 0DC291D6D4; Fri, 25 Feb 2022 09:58:23 +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 21P9wML0022298; Fri, 25 Feb 2022 09:58:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21P9wMBv022297; Fri, 25 Feb 2022 09:58:22 GMT (envelope-from git) Date: Fri, 25 Feb 2022 09:58:22 GMT Message-Id: <202202250958.21P9wMBv022297@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: 38803b17b28c - stable/13 - mbuf: make M_ASSERT_NO_SND_TAG() as strict as other similar asserts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 38803b17b28cb987506c3dbbd099a052ea91d9ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645783103; 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=ia7SMCBg97Gy94g+43h3o6luhMSoI00mQim0yzwxYNk=; b=QHjlrCkEOn+SqmlNICdWVMdXz7iQVO+97XoMpiskobh2tvfMZLMkVwSS/piDfOcVj13yXI Sgaw0Ywcci2UDN+tU+sdODxWjvitY4XDBTe8ROGdKj7/I18R+/SUw9oGEwTt2Dd2fYabVE BIyNMvyGbdoLioojYueP75lugBxke78DSV98CIJg57PNQseqF+UxODGHPRSNssJYLzHfC4 8PMriK0edfN1jHn2fZyc+feByTsMPB/kE3OX0wEE3cSpyyB6yZUwAkWi+HX37RaW48zsPc +OXwk5qHvVOm0+Z8gmKFVyzBsc/kmBnYJxW7rjBvYlj8mBzshOxJ0JWlJTgu5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645783103; a=rsa-sha256; cv=none; b=gKeRDSpker2CW/VAb5Org39Wdy0ZSU4kchtL0wUXhyTcTcJKjk/qs11JP+s2y2i83K5cHZ L0gfW5Ogybd7uYKadhpHx+FOwCbbBTm/idAnZoIsa5osXYn7XvzcLpdceRMNq24eFaK1HM dnjp31VDSyCq3pdjCB89VdWgm1rVmodLbHLyN8svzoPVfdSA72GyXYuREQ8K56x9Csx73P 7Z6DRgCuNeQOPjAowXtyjOTrYWvDIGmKZniTqiTNwcWH3y5KR+ytRgTMJhB0/BFQGJR0Ok YAohp3cHc4Jcc3g5KXFAF6M6fZSQMmSbrOBlgwhnuq9pjQ48Op4C+/mc+WAy/g== 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=38803b17b28cb987506c3dbbd099a052ea91d9ef commit 38803b17b28cb987506c3dbbd099a052ea91d9ef Author: Hans Petter Selasky AuthorDate: 2022-02-25 09:57:10 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-25 09:57:10 +0000 mbuf: make M_ASSERT_NO_SND_TAG() as strict as other similar asserts Fixes: 17cbcf33c3b6 (cherry picked from commit f59fa112807b85abbd070c8ef6b1ac6e70207acb) --- sys/sys/mbuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 427c6c9b36e5..6fd83b165752 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1111,7 +1111,7 @@ m_extrefcnt(struct mbuf *m) /* 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 || \ + KASSERT((m) != NULL && (m)->m_flags & M_PKTHDR && \ ((m)->m_pkthdr.csum_flags & CSUM_SND_TAG) == 0, \ ("%s: receive mbuf has send tag!", __func__))