From nobody Thu Jan 27 17:42:31 2022 X-Original-To: dev-commits-src-main@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 114DC1983BA7; Thu, 27 Jan 2022 17:42:32 +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 4Jl7Fz6rHsz4tcZ; Thu, 27 Jan 2022 17:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643305352; 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=JS2TKsoBgKqyzVNb+8ncPZth0PSBgz86OvYcUqJh1jc=; b=VtWSTnTyIWFXRh1H38CwyAptuOEPoMQ1/5D+jMLXOtgOkJ12XxCOzeXhYLZ7OgvafDcUj3 JRXR63HjGVn1EhyGDHCXc1Uhrky/m6/OUvDBgJsT9+g3HtWEKfjoctwaCuMqL095udeIID NUFq9RQRCzGTQDm6pyufyA1CPgc37vfZwAFURkgB9QT/KOV6hhk471xJ+jKfIGftWVDaiw BBTBB7T7/33NdjxIWtnPoJqROdNCCY+NaC9gM67kKUxSY1dU8ljMp/E2uqzZIFRoa/LqpN LZMwXo6Tu7tlJGQgLBKJllGuy6/fkzckr6eRlvrq/24RJb7FiTSfmKgb0AVqLw== 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 CB0A51B205; Thu, 27 Jan 2022 17:42:31 +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 20RHgVwe007145; Thu, 27 Jan 2022 17:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RHgV4H007144; Thu, 27 Jan 2022 17:42:31 GMT (envelope-from git) Date: Thu, 27 Jan 2022 17:42:31 GMT Message-Id: <202201271742.20RHgV4H007144@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: f59fa112807b - main - mbuf: make M_ASSERT_NO_SND_TAG() as strict as other similar asserts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f59fa112807b85abbd070c8ef6b1ac6e70207acb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643305352; 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=JS2TKsoBgKqyzVNb+8ncPZth0PSBgz86OvYcUqJh1jc=; b=PjfvdxVNmLRaVaUysk+KuSG4v1H78kfhxRtWJORA1gdYKV8Lc3O+GXEUqvPumrIlJAQgeM bTHtHLE8HLRc5jm6FKw0rXknBTWsk/leJsYssnzARgSLwxSf62TQTOGhHBKMQzX9tEEmBJ SuB1xg/P3dwj6ngu9fJdyTPXe5QdQjaJH+6aRR+iiwXLKF7SGzH4eSeKWy4kYWt/igAeoX sGt+75PWqxFYqX2QHkbF8c9MjwSbHNrAdQITk0dGxGKEpBRU+DtwSLGz2SurH9uPC52CQs bJX1bKPjtwaS1YiqGR0t3Ci8KzU5KGtX+ZejnsRYwHBNj5Xa+HuwxeJOpD2aHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643305352; a=rsa-sha256; cv=none; b=o7AJqowz86isDNKcQZId0QUigONuDYB7DdzvcsR7K51WURQSQ61RVZDJg9DF5KVao5M4Bk m52v11Ir7dEpmm/HXbX8LJj3uJex2GSLid4TUr5xl2+BAPFbHyKCFXDccwoEb5TlS2K3UU DKowMO82zLxGyza0Z6AZI6zyN3aU2eb5GJf8r7QhZTjaoEg3p2r0l+LACkjxutEMfdGDxl 1wpLaMv9SrvbbCAKX9wexL1KViNU6q2muMF474rn0FrQv0n8MeKtJaex9lcaFDC66AJT1/ 1zBoT7L1fPP5uY5x8/DP1w0vsv2laTUncTVPUWOjK48UZpGCdml0xUCVaWs2AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f59fa112807b85abbd070c8ef6b1ac6e70207acb commit f59fa112807b85abbd070c8ef6b1ac6e70207acb Author: Gleb Smirnoff AuthorDate: 2022-01-27 17:41:31 +0000 Commit: Gleb Smirnoff CommitDate: 2022-01-27 17:41:31 +0000 mbuf: make M_ASSERT_NO_SND_TAG() as strict as other similar asserts Fixes: 17cbcf33c3b6 --- 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 ebe8ef205055..78b175ebe2c0 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -1147,7 +1147,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__))