From owner-svn-src-releng@freebsd.org Mon Sep 30 14:32:42 2019 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CCEF12971F; Mon, 30 Sep 2019 14:32:42 +0000 (UTC) (envelope-from delphij@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46hlHF6WNXz41PZ; Mon, 30 Sep 2019 14:32:41 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B601C4195; Mon, 30 Sep 2019 14:32:41 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8UEWfQH068347; Mon, 30 Sep 2019 14:32:41 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8UEWfLS068346; Mon, 30 Sep 2019 14:32:41 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201909301432.x8UEWfLS068346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Mon, 30 Sep 2019 14:32:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r352902 - releng/12.1/sbin/fsck_msdosfs X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: releng/12.1/sbin/fsck_msdosfs X-SVN-Commit-Revision: 352902 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Sep 2019 14:32:42 -0000 Author: delphij Date: Mon Sep 30 14:32:41 2019 New Revision: 352902 URL: https://svnweb.freebsd.org/changeset/base/352902 Log: MFS r352872: MFC r351802: Correct overflow logic in fullpath(). Obtained from: OpenBSD Approved by: re (gjb) Modified: releng/12.1/sbin/fsck_msdosfs/dir.c Directory Properties: releng/12.1/ (props changed) Modified: releng/12.1/sbin/fsck_msdosfs/dir.c ============================================================================== --- releng/12.1/sbin/fsck_msdosfs/dir.c Mon Sep 30 14:19:18 2019 (r352901) +++ releng/12.1/sbin/fsck_msdosfs/dir.c Mon Sep 30 14:32:41 2019 (r352902) @@ -168,20 +168,24 @@ fullpath(struct dosDirEntry *dir) char *cp, *np; int nl; - cp = namebuf + sizeof namebuf - 1; - *cp = '\0'; - do { + cp = namebuf + sizeof namebuf; + *--cp = '\0'; + + for(;;) { np = dir->lname[0] ? dir->lname : dir->name; nl = strlen(np); - if ((cp -= nl) <= namebuf + 1) + if (cp <= namebuf + 1 + nl) { + *--cp = '?'; break; + } + cp -= nl; memcpy(cp, np, nl); + dir = dir->parent; + if (!dir) + break; *--cp = '/'; - } while ((dir = dir->parent) != NULL); - if (dir) - *--cp = '?'; - else - cp++; + } + return cp; }