From nobody Thu Aug 11 14:20:19 2022 X-Original-To: dev-commits-src-all@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 4M3TVD0shgz4XxJJ; Thu, 11 Aug 2022 14:20:20 +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 4M3TVD09k3z3KHX; Thu, 11 Aug 2022 14:20:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660227620; 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=F9qCUoGHjGeB1s2PLAk1/Zho9WeT7LbUgqT3uWvl0Ps=; b=a1ZhFDyHM2uSbGovWjk4gnDS76/DZ7CDLXmDMyBAz9zV1qYdfGjnWFL25jgpyflSddDwFm +uVHIzyTh9X4KibTML579yY/Ozz+U1wUZgPhtcwdvA6kN5wcaFinSpg8igv8pLa9reEpn3 SdroXxbooVZ89skKSQ8KQG5RcpMs+vapjKtZjP5IwAsCQ2luxJkEvUz8C33ubwV3aTkH6A exJi/uNn0cNwMa3QJLxw/oyphI/O4WowRcFc0e1apC2mT+6avlvdSOEgdj0BO2PHSfHevQ yy1W2np7Os9sG3cqbkz7SBaiBqcNXds3v8aQ24GRenszMD0QgbjxcFgZI4wSqA== 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 4M3TVC6N9rztHF; Thu, 11 Aug 2022 14:20:19 +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 27BEKJvm085458; Thu, 11 Aug 2022 14:20:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BEKJjx085456; Thu, 11 Aug 2022 14:20:19 GMT (envelope-from git) Date: Thu, 11 Aug 2022 14:20:19 GMT Message-Id: <202208111420.27BEKJjx085456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 78d7704b7c0d - main - makefs: Fix a memory leak in fs_layout_one() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78d7704b7c0d36a476e2c998a8510eb98e024753 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660227620; 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=F9qCUoGHjGeB1s2PLAk1/Zho9WeT7LbUgqT3uWvl0Ps=; b=gYxrqc+1nOHRZIX9G6zt6/HN7W5Cw8qqgoMYgyMew/jfi38P9+6Hf1AQRRwUrajLweV1oj vwDR2+ROVfW92u+GpF0qY/vRlmp80cni8iz1f8wfgiBXCrmXi0Y+u/uuFKEiQ8yhq9xh1E bMLbnve6B99sBCHlGNEYLAFl3jgeBZFkEEstNNruvrp9gBkk8Y5jemBXFjX7MuFO4T2bUZ DbxTZclB9GIUJOECV+CJxf7buCkQ+jQp+1/O3vGA9R4ltfq/A8imBWrUfgySNpv++EUIhY 8v1lMT7KQh6vnR7e2+EejrMeOd2GeKEI4Nvc437o7O1cnX4wkg15IO+wprrx7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660227620; a=rsa-sha256; cv=none; b=fwfhelCKJnaJHMn5M3AexTxxoW0cYGC6W0QGKoPOdL+2Am5ohBQELcOFunvlwUSnm3x0z2 6Qc5FwBKyIN6uKAY9kiv3dOwjNE/Yyc86gnRaWse0q/h6kUNc8KrO/+88CdULZhktllweQ PHRceTE9B3w4z0M2yG0ufCEMguqKBZYaGAOXgFaebu+pgfbaiOzJkTZ0UMnwhScLIWwEMg HEWJqph+X9yvBk9/KuKW4TMRMWCzazV+b/ZAI6OfGC7IGiEZO69ieoGac+EYKM4KKTjZ0S suhcBa3xt6AwivxNT5EZn1hRPmX8/l7PQKTvdUkqYxqxADW8MvflHzQAJBi0wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78d7704b7c0d36a476e2c998a8510eb98e024753 commit 78d7704b7c0d36a476e2c998a8510eb98e024753 Author: Mark Johnston AuthorDate: 2022-08-11 14:18:13 +0000 Commit: Mark Johnston CommitDate: 2022-08-11 14:18:13 +0000 makefs: Fix a memory leak in fs_layout_one() Check the canmount property before building the mountpoint string. Reported by: Coverity Fixes: 240afd8c1fcc ("makefs: Add ZFS support") Sponsored by: The FreeBSD Foundation --- usr.sbin/makefs/zfs/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/zfs/fs.c b/usr.sbin/makefs/zfs/fs.c index 15025ec5447d..2907a6b05f81 100644 --- a/usr.sbin/makefs/zfs/fs.c +++ b/usr.sbin/makefs/zfs/fs.c @@ -714,11 +714,11 @@ fs_layout_one(zfs_opt_t *zfs, zfs_dsl_dir_t *dsldir, void *arg) if (!dsl_dir_has_dataset(dsldir)) return; + if (dsl_dir_get_canmount(dsldir, &canmount) == 0 && canmount == 0) + return; mountpoint = dsl_dir_get_mountpoint(zfs, dsldir); if (mountpoint == NULL) return; - if (dsl_dir_get_canmount(dsldir, &canmount) == 0 && canmount == 0) - return; /* * If we were asked to specify a bootfs, set it here.