From nobody Thu Sep 29 22:35:46 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 4Mdp9G5szlz4YLJQ; Thu, 29 Sep 2022 22:35:46 +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 4Mdp9G5DNtz3SR9; Thu, 29 Sep 2022 22:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664490946; 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=OJk0RMnWcSRpGhIIpWiSAY7mw7CZmDxLXQUrdMxk7IM=; b=WsvfqCpu703k0Nncd8ysB+zedHrlM0mqXRoj2mpLBOaECSBlJuyrCnY9Bc2vyYanc2doov J/Qgk5hUFbm/mDdqHZ9wC2uv7p55foBorCfbhjuiv3Ge1wi5mZUQNtSvcmhYnLFN0Uv2iP GBrEBMIy52tXByNPqp64VPx5r53NGYhG0CboEdS1J2UOqCfyWnLm5WTcQHgTFBqHrxOCw3 vttabsUFGR/2s1I8UX4bPFCUqyDJQEoNgCXkQzh6IwhJroVX2vgrkCLX8X6Q3QurjMpCQT Qju5kFNsUE9cd0ltDrwKmHlMnEWFSM1S/ZCtoPwbNFH1H+P13/9UpOt5oY+scA== 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 4Mdp9G4H67zyKs; Thu, 29 Sep 2022 22:35:46 +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 28TMZkKt039767; Thu, 29 Sep 2022 22:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TMZkpD039766; Thu, 29 Sep 2022 22:35:46 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:35:46 GMT Message-Id: <202209292235.28TMZkpD039766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 6abdfd389044 - stable/13 - telnetd: fix two-byte input crash 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6abdfd389044a9fe193d0b88ae5510c4a68b01b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664490946; 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=OJk0RMnWcSRpGhIIpWiSAY7mw7CZmDxLXQUrdMxk7IM=; b=MZnzdXNoJlk0zpYXngVAq+ZAJLfp72SCVmYM0JV4TGjpB250X6F/AwqUFWYQYN/WJayff9 t/JnJubgN3DxzLIpxPYUdQlU8e6KkxSVzUJqqgzNdeiv7MLzdXt8qYjQ8vBp16BT4h3aaY L6AM7wPgSH5XYtz/p65eGalrD93czd5GDFdONLfjti9hKUX73Z0C1LnQqjlBqKv0z+QRJ0 f/VXoTekWwagZe/0Q/6dm5tC1g80IIyo8QDmICth4CI+LBX+uGEhGB9VgIKMgV5VgiAqus PdQAW/qTkWKi5G6bPyYNb9XmUv4NcoPscxYKEZJfot+tWSFaP+2/IJp3VS8+Kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664490946; a=rsa-sha256; cv=none; b=mBqaFabn8lIHE1BXaB01U8uyoz/dKjcdidzBVjLAvCMnZcp+qkayeoUtRWs3WehFdquThq xxeY1d4twRribiYsGvRvG+Bix+dTW1kJn//Mft+5uJNzEaPp45vI3IJ4C8kwznzwQJ7x2T f5MMt1uxu+LcO51VHmRhuY1dlEiqht7A5NUfL6wCykL6qkZPa47Gn+ZS//SCzkj8LQYO2Y tN5vq/lD4gDrR6pbViRbP6qvr6PDFgzK/tEAM9vOyafEZKvFBWwE9pnxIuJENISxbkOwUV ANt2fbplD+uGqs8DE71u/Dn/C3BbeVKv0dxqVKkIZGC255rr57OWFTQGuctPOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6abdfd389044a9fe193d0b88ae5510c4a68b01b4 commit 6abdfd389044a9fe193d0b88ae5510c4a68b01b4 Author: Brooks Davis AuthorDate: 2022-09-26 17:56:51 +0000 Commit: Brooks Davis CommitDate: 2022-09-29 22:30:48 +0000 telnetd: fix two-byte input crash Move initialization of the slc table earlier so it doesn't get accessed before that happens. For details on the issue, see: https://pierrekim.github.io/blog/2022-08-24-2-byte-dos-freebsd-netbsd-telnetd-netkit-telnetd-inetutils-telnetd-kerberos-telnetd.html Reviewed by: cy Obtained from: NetBSD via cy Differential Revision: https://reviews.freebsd.org/D36680 (cherry picked from commit 6914ffef4e2318ca1d0ead28eafb6f06055ce0f8) --- contrib/telnet/telnetd/telnetd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/telnet/telnetd/telnetd.c b/contrib/telnet/telnetd/telnetd.c index 522877829735..e12fe70997ab 100644 --- a/contrib/telnet/telnetd/telnetd.c +++ b/contrib/telnet/telnetd/telnetd.c @@ -658,6 +658,11 @@ doit(struct sockaddr *who) int err_; /* XXX */ int ptynum; + /* + * Initialize the slc mapping table. + */ + get_slc_defaults(); + /* * Find an available pty to use. */ @@ -741,11 +746,6 @@ telnet(int f, int p, char *host) struct stat statbuf; int nfd; - /* - * Initialize the slc mapping table. - */ - get_slc_defaults(); - /* * Do some tests where it is desireable to wait for a response. * Rather than doing them slowly, one at a time, do them all