From nobody Wed Feb 08 21:06:32 2023 X-Original-To: dev-commits-src-branches@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 4PBsxQ3twbz3pKLc; Wed, 8 Feb 2023 21:06:34 +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 4PBsxQ0v9qz3l3s; Wed, 8 Feb 2023 21:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675890394; 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=aRD1qTb0AmTSDfHwBerZ/6QE6Ki/AMz6ZHnZ3hbXd1U=; b=oKQFZxWZbZo5eVP0e/A5SGn6QimxovsWhRgYE2JNw6JlW0fRSn5LhVbv4iyVzbQLSElCSf IcCs28L43L1PUzYDfr+ZtS7P8mLAoGxL7gFZ8sjE/ioOGRk70cwsGOTmCVmOgsXEJs61DD Smn7vr3q/I6psSoDpoTUDWbKhPs8nxkJsJ16oc2he9vjK2Gh5abp/CTltYO4IPHiERUN+7 sobu9Cd26q1Hho1z/PhtDpCS0MZEU5Id+0qipTiBeUYiEVKdzWM3/fmGAvk3RE7PuZ94R4 6AKuwpJ6AL6cvfPBiwqS4sD5Y7jjOLAr7AjCYIkAU3czjN05r0yXdjO03xirIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675890394; 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=aRD1qTb0AmTSDfHwBerZ/6QE6Ki/AMz6ZHnZ3hbXd1U=; b=QLvzvctglA+rlJR6FVGncIyGGfN5eQChl17SZL4UZb/FFBTMNqcizWJfaZT8GRXGbr5tRh FG3G47W0x8OwLuPGg5GM09OBv3hNy5G1VW1mh4UyVqAqZs0IE1yDSsm/qQ/9zxDLYFMwAK C9/sA5UYmVbHZZ193HLjIJcRVEtQmvouwpEhHtpspRA9i6V1Be7ypYd+1TaObnfmqF/Wso yUBN3d2ePgdQSqdBkfMDoBtK9fq4OoAwg5qN+1f467X85xH2r523MRn9OnDfPfBMlwl+AU xs5PC9rvVgiwIKCXpkeEKpdQAd1hhHltP3jMB84j3/n05O2+CCkdYDqNBlKmgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675890394; a=rsa-sha256; cv=none; b=Dao/jqv2cNwW7JfpZ1to8IRCb0BaO5TvrtbsLHiUaMnh3a1sSKkRAX8f3j04+woXrmDt+S 6EVERd27xrNEqDHaSY7ciGjpIHAWNDMrVn1u7szo05jcdsLVyK0uKgWl0TZyOyWKex5VdN UQSZuIT4WYzFKT1tJhVhSBOiBR7+Npb23BlIZFSHtuLoI9atKXjk5W7LU6A5wzybTvq6zQ 4HyS75gHXUX1odVESK3NKuobqoExkhh0wqkAVakR5CbNZAF+P9XeO+I0aYLK4lg9Io/T3l XI+NEL9vTMmyfd9kvQVeoxrQ8T4n3lafeiAPrtODm2/2g0Bj62Y+3MKMEIN2OA== 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 4PBsxN3R5Pz1BLy; Wed, 8 Feb 2023 21:06:32 +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 318L6WqX068087; Wed, 8 Feb 2023 21:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 318L6WjF068086; Wed, 8 Feb 2023 21:06:32 GMT (envelope-from git) Date: Wed, 8 Feb 2023 21:06:32 GMT Message-Id: <202302082106.318L6WjF068086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d07cfacb67b9 - stable/12 - ssh: fix bug in PermitRemoteOpen which caused it to ignore... List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d07cfacb67b962d80bfe089aab22f5b312a439bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d07cfacb67b962d80bfe089aab22f5b312a439bd commit d07cfacb67b962d80bfe089aab22f5b312a439bd Author: Ed Maste AuthorDate: 2023-02-06 16:33:38 +0000 Commit: Ed Maste CommitDate: 2023-02-08 21:06:22 +0000 ssh: fix bug in PermitRemoteOpen which caused it to ignore... its first argument unless it was one of the special keywords "any" or "none". Obtained from: OpenSSH-portable commit b3daa8dc5823 Sponsored by: The FreeBSD Foundation (cherry picked from commit 94e21add45344f0669f910ea77db499e8c892c90) (cherry picked from commit 375bb3704d1371dec08f49cf8767f7b98162da34) --- crypto/openssh/readconf.c | 62 +++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 4487b1066fa7..2bb38ff70a19 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.369 2022/09/17 10:33:18 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.371 2023/01/02 07:03:30 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1577,37 +1577,37 @@ parse_pubkey_algos: case oPermitRemoteOpen: uintptr = &options->num_permitted_remote_opens; cppptr = &options->permitted_remote_opens; - arg = argv_next(&ac, &av); - if (!arg || *arg == '\0') - fatal("%s line %d: missing %s specification", - filename, linenum, lookup_opcode_name(opcode)); uvalue = *uintptr; /* modified later */ - if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) { - if (*activep && uvalue == 0) { - *uintptr = 1; - *cppptr = xcalloc(1, sizeof(**cppptr)); - (*cppptr)[0] = xstrdup(arg); - } - break; - } + i = 0; while ((arg = argv_next(&ac, &av)) != NULL) { arg2 = xstrdup(arg); - p = hpdelim(&arg); - if (p == NULL) { - fatal("%s line %d: missing host in %s", - filename, linenum, - lookup_opcode_name(opcode)); - } - p = cleanhostname(p); - /* - * don't want to use permitopen_port to avoid - * dependency on channels.[ch] here. - */ - if (arg == NULL || - (strcmp(arg, "*") != 0 && a2port(arg) <= 0)) { - fatal("%s line %d: bad port number in %s", - filename, linenum, - lookup_opcode_name(opcode)); + /* Allow any/none only in first position */ + if (strcasecmp(arg, "none") == 0 || + strcasecmp(arg, "any") == 0) { + if (i > 0 || ac > 0) { + error("%s line %d: keyword %s \"%s\" " + "argument must appear alone.", + filename, linenum, keyword, arg); + goto out; + } + } else { + p = hpdelim(&arg); + if (p == NULL) { + fatal("%s line %d: missing host in %s", + filename, linenum, + lookup_opcode_name(opcode)); + } + p = cleanhostname(p); + /* + * don't want to use permitopen_port to avoid + * dependency on channels.[ch] here. + */ + if (arg == NULL || (strcmp(arg, "*") != 0 && + a2port(arg) <= 0)) { + fatal("%s line %d: bad port number " + "in %s", filename, linenum, + lookup_opcode_name(opcode)); + } } if (*activep && uvalue == 0) { opt_array_append(filename, linenum, @@ -1615,7 +1615,11 @@ parse_pubkey_algos: cppptr, uintptr, arg2); } free(arg2); + i++; } + if (i == 0) + fatal("%s line %d: missing %s specification", + filename, linenum, lookup_opcode_name(opcode)); break; case oClearAllForwardings: