From nobody Thu May 26 18:35:59 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 2995D1B5469B; Thu, 26 May 2022 18:36:00 +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 4L8Gpm0RWVz4qfF; Thu, 26 May 2022 18:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653590160; 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=vvHv4djtINd8yQNffx5ejaOhAlezxaVd8a9sDaTaN70=; b=CIMhKlYL9Q7sVI7+aM6AsEeFo0wsINyIAHc2e3shmQ/uKpa8ToeF1p4ZSBfPTRKmdhQZl+ DFhi6AcgHZoopqbL2+uyei8Y3QZsw9sc8LCQ0ZyQdt5OX2tOh0ZoT05i1tCAWf2+efPY8U mmuo8sCnJeYn1QCVH9LB9pTCBZGJgkeMmNJ+tgS2kxp8ZfDd7c9wJA/e6+HPNO0UIPPCkh wKwtj59+dmzfHCuE7ri3mAo7px3tpshBzZ6X3F7HDvXFW56f3qKaybyD3g5DGd3WpMXc0d OEd4cnn4FPu9AHpG1FELPy3XpXC+XA7VijBiyt3sHp1im/1Fb09QHBDvEVfgaQ== 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 E3A0013493; Thu, 26 May 2022 18:35:59 +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 24QIZxIl030270; Thu, 26 May 2022 18:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24QIZxgF030269; Thu, 26 May 2022 18:35:59 GMT (envelope-from git) Date: Thu, 26 May 2022 18:35:59 GMT Message-Id: <202205261835.24QIZxgF030269@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: 75e7e3ce34d9 - main - unix: fix incorrect assertion in 4682ac697ce 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75e7e3ce34d9782d825f7b3579afd82e3de55b5e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653590160; 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=vvHv4djtINd8yQNffx5ejaOhAlezxaVd8a9sDaTaN70=; b=JW0VbsGc7cqwsUz8YXtkO0MwMj5RcnUjTtfK2rmp8xahbkiE+6oTka7c0xZA23CnUR9NnI Bh5K9yXpSZKefemlpUXR3qbOvAhcwBRHT+flch+461y+OND8S83Wj00pK+O9NpN/wvSZfK ACsh56Y23lOFj1RE/EqEoApBYSumVF/cIz+P6sG/vjFB1Y1lWd6SQ6TEWu7IzOv5MohTLf H4Rstzf22Xec/6bWskfR5uF643kQprnVwVYv01CHHit98FEP2taKyOTSzC79PgVGD2bMjr o/ldIJeIKjREkL3nDdqdYDIIq1J/0CwFzFQrfFIVuF33XUNvM5U1XWgUhBwNsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653590160; a=rsa-sha256; cv=none; b=XaY78ZGIebHz3MdArfwKG6nuJruvFPBHRFW70iPZcSU/beRgYQ9lrsWU1qOEW+WUKfk5qw KFWk9xVG89Gymwss/bBr5exa/PzVMkJFE1osHS8wo8KgATIewuHZ7i8CRXNTjmAoNAFhrQ V64gyDCPHQDNS4beumwgLxIxr/2giV1mnEhCyyrzQZN1XdECULNpnWlJJ2YSrTvVBtqRt4 WV7rBHk7l8j6OZ2KnOhptc9HbCrQKRirsmFfOAKIm+J65aTCvka/F7nFUAW3g9V0jZ8wHX QfalRU2+kUnCW1x/pCR4P+wYcqx0/ZFcXuj75LhX2kQTP2UhSb635OxNjEX0mQ== 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=75e7e3ce34d9782d825f7b3579afd82e3de55b5e commit 75e7e3ce34d9782d825f7b3579afd82e3de55b5e Author: Gleb Smirnoff AuthorDate: 2022-05-26 18:35:05 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-26 18:35:05 +0000 unix: fix incorrect assertion in 4682ac697ce Pointy hat to: glebius Fixes: 4682ac697ce9b306d11e03a628d1ac07f4b540c8 --- sys/kern/uipc_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c9e40c664042..4903120fffeb 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -2015,7 +2015,7 @@ unp_externalize(struct mbuf *control, struct mbuf **controlp, int flags) if (controlp != NULL) /* controlp == NULL => free control messages */ *controlp = NULL; while (cm != NULL) { - MPASS(clen >= sizeof(*cm) && clen <= cm->cmsg_len); + MPASS(clen >= sizeof(*cm) && clen >= cm->cmsg_len); data = CMSG_DATA(cm); datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data;