From nobody Mon Apr 18 16:20:07 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 CC8BE11CF8CA; Mon, 18 Apr 2022 16:20:07 +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 4KhsbW5Mc0z4rpF; Mon, 18 Apr 2022 16:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650298807; 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=DU++iJgzQfJrP054s5mHLgjV6vYxtTSjuX9AkYSyucQ=; b=urTuJTrRAMZ6Stmij+FkEZa4cNH7rZC+mQFH/8E5Jq+nzp/G/ZSHisrctDSO1n9knBxzxn 2juIHD9dT/Eehc5fChFfJEygg4G2GuqX24qtYxSv6jJJJD3kQgO7ZEWopFQMbGrenkp/d/ TOynuE1jwS0iCtqpj9+18Aa4WWU3uyl6zDt1pyBeQ4ajyZibpdICARlg8dOO2zx/GlVFFW UgfFYTo+92iJ6A7pblKfHjQiibsbEvdAMX9IJ4TCi/rlNkYM7gMw45b9waZQS2zJKEay+G clFMDm5RlkbHXeWvG/0sQHuRRqHt+Wm5Iomrz9KlCo5K06hoTfsu9FXsja3ZgA== 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 9844D1618A; Mon, 18 Apr 2022 16:20:07 +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 23IGK71r061528; Mon, 18 Apr 2022 16:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IGK7Ag061525; Mon, 18 Apr 2022 16:20:07 GMT (envelope-from git) Date: Mon, 18 Apr 2022 16:20:07 GMT Message-Id: <202204181620.23IGK7Ag061525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 60c952d47249 - stable/13 - tty: Remove an incorrect assertion from ttyinq_line_iterate() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 60c952d4724974b877b2ec02784e22b74dab8809 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650298807; 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=DU++iJgzQfJrP054s5mHLgjV6vYxtTSjuX9AkYSyucQ=; b=FFkQHCy5CtQqhCpK5jXUBaBtS/+9r235l3xD3ywel5Tb8cSltAEyqeH54o6pKe6solwvFL xy2O4mFAo7O+LkLY5M4iMLJ9Z1gQfxj8iVEAhNjJyBW2eakpU5SYRTLGpHkoWnmMP0zrRj J+MwogtdV9dnq8I9SI6jkwjo0m6hV67PejlrNL2cWcHFrs0mjtj+jumGu/n8Y7urFLh14q YGJgk6lbxayJtyNreCDJZjJOR8NwonhFqigj97G1e4pr1aDVzySp1m6lV+sHOBJFiEmDWI tAankZIsLzJPjXYz7scWT7luuavgXA143fpiUtobFRPe2JFshyBn0USoP8vPfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650298807; a=rsa-sha256; cv=none; b=rV7nJhuxsOBDu6lOwyN+NPiTgSXJym+x5yf8oUINfdnH2FcxouF94ye3XfAkC8ZboNNn+x FUiuEsJYm/ia2Lkh7mSZMdgpP1z6FiD9eEwHKO34ZEQQou/+ZF8ouraBJhqC0z17CsNzo5 zumWw9K4tGs4E216JqLjsM2Aj6WJnukTguhq4Dz8dn/uxzoO9zXk56NQoxQIcVjdPGyY08 TqNAe9zZpL3OBR4rCyuthsAjJb5xpBM/dshTTA8ziRhdLHb8ztIU0Ei8D1zQEADXCdRaDp 55QlpjSQGXpxccLqE1WfdEiZUg0X+MpuGCyT+lfCVt/EQA5MEzFu3Aak/E/ryg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60c952d4724974b877b2ec02784e22b74dab8809 commit 60c952d4724974b877b2ec02784e22b74dab8809 Author: Mark Johnston AuthorDate: 2022-04-12 21:30:04 +0000 Commit: Mark Johnston CommitDate: 2022-04-18 16:19:57 +0000 tty: Remove an incorrect assertion from ttyinq_line_iterate() We may legitimately have tib == NULL if we're at the very end of the queue. PR: 215373 Reported by: pho Sponsored by: The FreeBSD Foundation (cherry picked from commit d769609620931a62ebacbd4f1f5fd048c7e3d7c0) --- sys/kern/tty_inq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/kern/tty_inq.c b/sys/kern/tty_inq.c index bd26211735d2..069da33ab26a 100644 --- a/sys/kern/tty_inq.c +++ b/sys/kern/tty_inq.c @@ -464,7 +464,6 @@ ttyinq_line_iterate(struct ttyinq *ti, /* Last byte iterated - go to the next block. */ if (boff == TTYINQ_DATASIZE - 1) tib = tib->tib_next; - MPASS(tib != NULL); } }