From nobody Mon Feb 06 23:17:57 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 4P9hxy0nxcz3nZ5v; Mon, 6 Feb 2023 23:17:58 +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 4P9hxy0312z4P5Z; Mon, 6 Feb 2023 23:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675725478; 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=rNRzaSQwienUexRunZrSvg2MlZRzi2iaqB5PFYaLF9I=; b=hOKvQ7B2FyYGyIhmILluQsn/TqMZyN4tgKsrKTxmitRZMJSQdJzdbNlZ33V5EhJEIksdIP ysPOlER+5g1762qqwlGrOBdFBlFdOqHRCD46l3QqKlHF0ZCh7EV/UQI0N+gRxtfxCaH6DT +qI9kzXgeDKrZ0DijO5oZMv0A44r3pAIGfrsaYt69a3QImerLiC0E/Ba7ZP1RZn5ILAJ7j 4/stYQz8x16l5/g9NB3rxkO+9i51TBKojw2jQ8aK9VNqahD/QXGXFUy0vRQZ0mCE06yZ8Q CSkB3zbwzTwwLlItYgvlhboxGIn7IWIky7PHJwjo0rRNWgybFxh4rh4zZdwMGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675725478; 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=rNRzaSQwienUexRunZrSvg2MlZRzi2iaqB5PFYaLF9I=; b=Vlqg6WZf5ZFRfQ+hx2D4l7zKpZ0K9Sm4OijXRUfI6wVmWcHsfA1w3dFjC0A87Lh88NgYrV 8DS+1UikgqXB2cfM6UW0WqvrmQ1aeQzFuVD2sCT6rClt61vtvdIBS8m42dS0cA70ILaOt6 PWHR4oSpI+cr+hTsL7hfKm/jTrICMhUuMMtUPGF2IhgY0Q83R3pdOURQBB2pFEameg9LXw gq82q65jcj/Q2x9Db+0sAiUThxBKsn04QwSYmsHVkVp+TE3J1jnUVm7pxvstqbwmZ5tFa2 Wfk2BVFYxCace4jqi+gAHeLLnviH3XMc/STTi0zHn/A9gpQIAFHKd2jmZNMQPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675725478; a=rsa-sha256; cv=none; b=VrOLiV6IUHluTHNt2HBvY3vQT8rBYieBB5p/ulFTuW5udaJXlsSsoW4b6+LcxwPd+OkTbZ eVMDc0gdEnH8g9wEQ8yyrQauyXBQWlIN6sATPV5O5y52MRUqmhenXiG0sMIdG+lAdpTBsj rVYsg0zzFh+spFafAMF1WqbJr5TG5udA8UxY14zmYC5CY9oFx37XPIkgnnP6xNAwwdqSBf msoX7scZdb1081OrpcTu6iB/4U3hGMIknHJgFp6UZ8ARdhyAjE483S0TvZ7lJEntEU/u+c SCzh0IjpOWyfoQuudazUeCkaDmKhVev2Q0uB7a6hy68rswFPpCozFjTyr2RvhQ== 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 4P9hxx63N5ztWW; Mon, 6 Feb 2023 23:17:57 +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 316NHvJX037625; Mon, 6 Feb 2023 23:17:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316NHvDl037624; Mon, 6 Feb 2023 23:17:57 GMT (envelope-from git) Date: Mon, 6 Feb 2023 23:17:57 GMT Message-Id: <202302062317.316NHvDl037624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: e11fe183004b - stable/13 - Rewrite to avoid Coverity false positive. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e11fe183004beaba7ec25b120c7394732fdef680 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=e11fe183004beaba7ec25b120c7394732fdef680 commit e11fe183004beaba7ec25b120c7394732fdef680 Author: Kirk McKusick AuthorDate: 2023-01-26 00:57:26 +0000 Commit: Kirk McKusick CommitDate: 2023-02-06 23:17:39 +0000 Rewrite to avoid Coverity false positive. Reported by: Coverity (CID 1502669) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37907 (cherry picked from commit 0bd4c448ec1dfdc2300a6cacca42e1fc7c4d8f14) --- sbin/mount/getmntopts.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c index e6607c385341..7702da903749 100644 --- a/sbin/mount/getmntopts.c +++ b/sbin/mount/getmntopts.c @@ -166,6 +166,7 @@ getmntpoint(const char *name) char *ddevname; struct statfs *mntbuf, *statfsp; int i, mntsize, isdev; + u_long len; if (stat(name, &devstat) != 0) return (NULL); @@ -178,12 +179,13 @@ getmntpoint(const char *name) statfsp = &mntbuf[i]; ddevname = statfsp->f_mntfromname; if (*ddevname != '/') { - if (strlen(_PATH_DEV) + strlen(ddevname) + 1 > - sizeof(statfsp->f_mntfromname)) + if ((len = strlen(_PATH_DEV) + strlen(ddevname) + 1) > + sizeof(statfsp->f_mntfromname) || + len > sizeof(device)) continue; - strcpy(device, _PATH_DEV); - strcat(device, ddevname); - strcpy(statfsp->f_mntfromname, device); + strncpy(device, _PATH_DEV, len); + strncat(device, ddevname, len); + strncpy(statfsp->f_mntfromname, device, len); } if (isdev == 0) { if (strcmp(name, statfsp->f_mntonname))