From nobody Tue Oct 04 17:06:16 2022 X-Original-To: dev-commits-src-main@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 4Mhkcm3KYDz4fGnl; Tue, 4 Oct 2022 17:06:16 +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 4Mhkcm2pjRz4Cnx; Tue, 4 Oct 2022 17:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664903176; 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=BAxNRqTGPwBjJY0q1ox3mE7JnJLkirOs0COBdnMzfkw=; b=XRzkRMQjlc4d8lyudiNPf/ZiVfDqV+lgSfeojLyCScbjT5VHx79ARmQVkOJLrWHepsLGSq mbXI32hRaqTUW5ifFTKI1Og7rlXHZMedf3lddmH4ZC3CaynUDg6YArYsPMc6P7+oooQhtZ ZoYBqI0gjL/QZc/Q+Ir9uwJbf045Ec385MnPXimxiZWqwaI3AiG6NBShjswJb1xQxdfJp5 JI+kK++1dgzOzWBUQRVYAwq6vxEAmxqpIzwH9a19FQjdu6B2sJ1x5yatrCWrdADtXU1X0l N8YnplZmfvz7MHOV5KdAkCC9vHA03EbV1Mq5RHlRYpTKEVRmeUA6n2UTy8Jq/w== 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 4Mhkcm1mSTzdDb; Tue, 4 Oct 2022 17:06:16 +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 294H6Gpq099325; Tue, 4 Oct 2022 17:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294H6Gpc099324; Tue, 4 Oct 2022 17:06:16 GMT (envelope-from git) Date: Tue, 4 Oct 2022 17:06:16 GMT Message-Id: <202210041706.294H6Gpc099324@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: d7eec79b7021 - main - makefs: Plug a memory leak List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d7eec79b7021b8d96bfc327326b84ad7a9edcfb8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664903176; 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=BAxNRqTGPwBjJY0q1ox3mE7JnJLkirOs0COBdnMzfkw=; b=sihce5zC1GCugZI5RSxrRI/9HbrWsJQaX/9fZ16izgeu3j9wXEoyVjXoEgZxitBi1EVk7/ 3Bcvn+9AZZrvq4YqvRDzMvskZsgmeLiayFadPS13veBrIijv3bD70tHEUepyB8Om31klw4 SwPXSnDWGBRTjleImOZO4UWx6xrdDwksGqXg3v6X6ttyKUgEcJJAmRB4fKjsc8XuZ/eObY dnnRDmw7KfVSZl1yiFBwu53xm6L0T6bR5lcXMyAL14leJcPLDI8dOWiQaN6VXRWPk15Z8Z wbuF3Y4zFfpNvwI4gRe+ajcqYDKAjlYXyWup2opeRtesbjsHASB6ZvW0TAld5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664903176; a=rsa-sha256; cv=none; b=MAuCeNdQq32xmz8EDKcdIlK3gW9V9IOAGhx185LSTvUPYbzXcbJOqKqdtIAYYQiClvKCWs /17LD6i+s5xCuuSAoKKwoFKITif4JCNkRrBVE5ldtEJ+H1hf6DlEWk4gQwCEilZVJJR6kS cmCrGlhBIS+4zZmZnappiduWp63BrpKQGkMqzwf1OKeNPnM39Pt8VebQxtxoKfR2NhwXIv R0ySFgXIGbUrOs2QdicebMNgYoWbk4WJcvQpdOADCg+ucsHyit5TUDTqhH2+hJwtctcRnU 11IZLaCe477pJu2XsVuN8sdtGZDZgsQjuJ76/x1G0r1KoQ++EadRMswMj3ilug== 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=d7eec79b7021b8d96bfc327326b84ad7a9edcfb8 commit d7eec79b7021b8d96bfc327326b84ad7a9edcfb8 Author: Mark Johnston AuthorDate: 2022-10-04 16:46:39 +0000 Commit: Mark Johnston CommitDate: 2022-10-04 17:05:54 +0000 makefs: Plug a memory leak nvlist_find_string() would return a copy of the found value, but callers assumed they would have to make their own copy. It's simpler to change nvlist_find_string() than it is to change callers, so do that. Reported by: Coverity --- usr.sbin/makefs/zfs/dsl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c index 28560dd4a429..52cb2fa22589 100644 --- a/usr.sbin/makefs/zfs/dsl.c +++ b/usr.sbin/makefs/zfs/dsl.c @@ -75,10 +75,8 @@ nvlist_find_string(nvlist_t *nvl, const char *key, char **retp) int error, len; error = nvlist_find(nvl, key, DATA_TYPE_STRING, NULL, &str, &len); - if (error == 0) { - *retp = ecalloc(1, len + 1); - memcpy(*retp, str, len); - } + if (error == 0) + *retp = str; return (error); }