From nobody Fri Apr 21 13:46:54 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 4Q2wmt2Xx8z46Rw6; Fri, 21 Apr 2023 13:46:54 +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 4Q2wmt1zStz4FWY; Fri, 21 Apr 2023 13:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682084814; 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=UfalPSEGZ+lWiD+NPK9nGEwy60jowamBMT1Z974KgbM=; b=vaNaUxbh2f1VxuhLt2W4A0rGFdU/EcoiVTbPUtWCbxX07YkCDjcfg8HRln9+250NTWdt3o Iqm8JkmhOHCgH0EUp9rJ34KBfdNzBBpLsrzKUyxONM45tFKxNr8huPMHy1nB9UCWwipapL NcX7XoMvgZrh3Hq3HZ4QneVr2TKrYpDw0H10zQR5Qvl1o50xlvZAUpcr3Z1z2bsgY7wlbk jSyGY4Zyz9DZPOQLiUNKVWl9aU7oM0Xc5f/YXe5cN39Lz9VwFnty6WOuKJtgR+h34482bv PAnbX1E0lejwsaIlGQ+J5iKJUZQqktdhIb1J7rxN3FFs3KVyWGgWvlgr+dzAnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682084814; 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=UfalPSEGZ+lWiD+NPK9nGEwy60jowamBMT1Z974KgbM=; b=hUEFt85maviGGpAtOeXGoExxMeuoR37dZGwsQBcGwYw6l1gRBuWJzjIaER8qe9kU/B3PC3 IoIPh3P5vQ5FKA1wWjm5L5Qr9Qs12KVgVPSrMk+li06njzWUU7wCgnqSoVFJOgo6G8zNJ1 qOc1hL57vAuTqQjw69K0yJd8XDFKI38Y9UVGRM9aUqMolaZOAjg1U3VAtkKYRFRzKwzvWJ dk1iFPEPNnvYzwW8oKjPA+HP793PHUde03IXV5anAT9K4MauFBCLapUu2QW2YHKG2ijTr7 ykOORRLG1iZ2BUj1UDztFbESFLFfJgIfoAKs2BqtzsEP1A85byK0yADg9r0F2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682084814; a=rsa-sha256; cv=none; b=uCU0cjnry13jHohCLO3ibUL0ThjWYl8iRgbv2N466Liez4avENLdFfrY62GtAeHO45XDdL YDvj2h5No/DytvH3pwj2a9zpCn0CqS+4t73Utb9pT2XKAH4TZkf6S/dCkJKvn/chxfpgrN 0Sis7/8R2RJgFPWlleCpItgBFJUXlyfXBc4f4x+oWqlUMyEI9sPuSU1yeqCzHO9eYCLDVn rigZ6sxMjPq/TxUxpGrbneyOLDh/xW4/C0EX7B0xHBeyC6RtytvlcYasVLpI0iRUWByq4R y1J1B28g6Ey9Kggj1TY7EPgYLd0LLi8VEHyJIg5PUys0Nn1b1Yz9d9WJPlg+HA== 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 4Q2wmt12n7zMM4; Fri, 21 Apr 2023 13:46:54 +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 33LDksEx069033; Fri, 21 Apr 2023 13:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LDksWr069032; Fri, 21 Apr 2023 13:46:54 GMT (envelope-from git) Date: Fri, 21 Apr 2023 13:46:54 GMT Message-Id: <202304211346.33LDksWr069032@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: 533a942a213c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 533a942a213c9e852265f94d27f1e9768294eaa6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=533a942a213c9e852265f94d27f1e9768294eaa6 commit 533a942a213c9e852265f94d27f1e9768294eaa6 Author: Ed Maste AuthorDate: 2022-11-03 17:17:40 +0000 Commit: Ed Maste CommitDate: 2023-04-21 13:45:30 +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) --- crypto/openssh/sftp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/crypto/openssh/sftp.c b/crypto/openssh/sftp.c index 29081db3d434..ce7ab7f8f2fe 100644 --- a/crypto/openssh/sftp.c +++ b/crypto/openssh/sftp.c @@ -617,14 +617,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; } @@ -637,7 +637,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); @@ -1997,9 +1997,7 @@ complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path, memset(&g, 0, sizeof(g)); if (remote != LOCAL) { - tmp2 = make_absolute_pwd_glob(tmp, remote_path); - free(tmp); - tmp = tmp2; + tmp = make_absolute_pwd_glob(tmp, remote_path); remote_glob(conn, tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g); } else glob(tmp, GLOB_DOOFFS|GLOB_MARK, NULL, &g);