From nobody Tue Jun 06 12:45:33 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 4Qb9Dt0vtTz4bSpl; Tue, 6 Jun 2023 12:45: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 4Qb9Dt0MBwz3LCD; Tue, 6 Jun 2023 12:45:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686055534; 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=4jn3SJWJCo9ND2vkyE8bep7hsm6Ua6HCJQWuAlcVovA=; b=sHTZl3K8BD7iU/G1HQmSz2lSodLdJk0f+TWoW7uFyZS5aqHrt2CKaruDZ2jqEbLr4rnA9k FbXnzWakoAIpoWwLIHElQz361Lua37j4/S8derUL+5F/IrlCfalRZBM2SGVyglB91z24dh 5CRwA6OPtVAkXjk4sMsF5MuMkaEwVgtaQ3D6SwsEC7X6SxgnaEBtjeUDCT9Ij8s1kWkPbm n04NwwaDvSubb/KgwC8FmkTV5QnUNuLJkZKEBT4UPSF3fLrJRuXZZgZAKBCNqwCafkTwUB i3eLC5HE0ALId1Fyd64x0UkEsUQ6/5yHC95mPGY0svtqkJMr31e4QzC43mseLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686055534; 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=4jn3SJWJCo9ND2vkyE8bep7hsm6Ua6HCJQWuAlcVovA=; b=Hdox4RT6BEqYtjp3A1LXaeK1klXJ01lPPqkXIz+V3M6iTfQ98bvTW+yKXqXDXh2adWuyZY 5idj7+lmOW1G/rQy5zNydyF+8jcV6uk7XIBZ8BQPfW0CJg2/zwlj5j3y5h4nBUfpks230t XlNSm67Vfc4vdt36PCZo4S8MHqQuXa87UqHOg2uKKAFhKyT25AcczcFiEGU4vngILdfb98 TdVP7bRcv58OM2SwWYoAqTi7u+LjyIl5oFjQsXpC1VvVHH9uwKRszyPKg7I+oKrafNXIu8 8Ys0A5DTrYKrR+ceJMUCBwdFm7rtNXg7qQdtjDI8Jpyf1JHImoJX6+RQLDqVBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686055534; a=rsa-sha256; cv=none; b=OpOd6wWHy8GC55G1RFJ99fqG2wJUllXH8wbxQXXrqcAnfwblUWcZj9EcBhKeFK2wpdidco HD+A7rQZCDG/JkmjFC6M8Z8jf3ehYasSpwZ5vRKwi/MNPnUEhyz5cL/Yd4ef/Q3sQa+SeX K08qTp5yhXyopp84UL6mTdh8HLdNo8+0Lw904XdUHhO50Ip5NB6suM3fY0vwctDoSI/QTA XAjHmX4WY2pyl8msjAwHL+POoSdwUl0jp1wewvgonDMnuBgtIsNf6RNDFcj6jr1zMDicyb tYIMHgi9ZcUlrfb3o2NPKdZbdjyFiOI0Jd+8djcUBqOIWt/rau+nyg8Hsfkwyw== 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 4Qb9Ds6R7gzVdZ; Tue, 6 Jun 2023 12:45:33 +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 356CjXG1034794; Tue, 6 Jun 2023 12:45:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 356CjXmc034793; Tue, 6 Jun 2023 12:45:33 GMT (envelope-from git) Date: Tue, 6 Jun 2023 12:45:33 GMT Message-Id: <202306061245.356CjXmc034793@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: 52503c4477cc - stable/12 - sftp: avoid leaking path arg in calls to make_absolute_pwd_glob 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: 52503c4477ccba162baca69fb2801f26ff5a5572 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=52503c4477ccba162baca69fb2801f26ff5a5572 commit 52503c4477ccba162baca69fb2801f26ff5a5572 Author: Ed Maste AuthorDate: 2022-11-03 17:17:40 +0000 Commit: Ed Maste CommitDate: 2023-06-05 19:07:56 +0000 sftp: avoid leaking path arg in calls to make_absolute_pwd_glob As Coverity reports: Overwriting tmp in tmp = make_absolute_pwd_glob(tmp, remote_path) leaks the storage that tmp points to. Consume the first arg in make_absolute_pwd_glob, and add xstrdup() to the one case which did not assign to the same variable that was passed in. With this change make_absolute() and make_absolute_pwd_glob() have the same semantics with respect to freeing the input string. This change was reported to OpenSSH in https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-November/040497.html [and was later adopted upstream]. Reported by: Coverity Scan CID: 1500409 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37253 (cherry picked from commit 69c72a57af843267b220f8367c4cc7162a12d696) (cherry picked from commit 533a942a213c9e852265f94d27f1e9768294eaa6) --- crypto/openssh/sftp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index c3c347e087e4..630e7773af75 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/openssh/sftp.c @@ -621,14 +621,14 @@ escape_glob(const char *s) } static char * -make_absolute_pwd_glob(const char *p, const char *pwd) +make_absolute_pwd_glob(char *p, const char *pwd) { char *ret, *escpwd; escpwd = escape_glob(pwd); if (p == NULL) return escpwd; - ret = make_absolute(xstrdup(p), escpwd); + ret = make_absolute(p, escpwd); free(escpwd); return ret; } @@ -641,7 +641,7 @@ process_get(struct sftp_conn *conn, const char *src, const char *dst, glob_t g; int i, r, err = 0; - abs_src = make_absolute_pwd_glob(src, pwd); + abs_src = make_absolute_pwd_glob(xstrdup(src), pwd); memset(&g, 0, sizeof(g)); debug3("Looking up %s", abs_src);