From nobody Wed Mar 02 21:57:32 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 A6D4119E0CDA; Wed, 2 Mar 2022 21:57:38 +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 4K87Jc1JV3z3KLQ; Wed, 2 Mar 2022 21:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258256; 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=WzIX0R+j8JK36UEGpLtKI3QakjLyPF8osvorzKXZVio=; b=iPis9GXXidFJVCRpgXqoYmojBS06LOh4qEcWfLLtPxyeZoZkvAUJQwOyup+1JOjufpOnAT 7ZJJehWPFbRlZL+UsCL2mnH1OqaYTQ6rhUucbq3wWUcUJixTCNYW/BBXDoJTlHW3+f/fnS a+vyOIGE28c5RxkMZxR+TdcuWFUvhJc0jguynSndSEvK/yFBIjQPtlkDURwGVxGDCuuS0v RMk9thC8wylBMWn9cw96aIf/r2mmXIevsvOu2Gnlw6+m62YvZ0IZrEAzMFCgYxubBGcSVg r+pheT1/DLAxFwKveFPtD5f8g6tUtGCVB3K3klJ6HwC+SZZyyztd069LFDd6iA== 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 02B5F346A; Wed, 2 Mar 2022 21:57:33 +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 222LvW9e065366; Wed, 2 Mar 2022 21:57:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222LvWfm065365; Wed, 2 Mar 2022 21:57:32 GMT (envelope-from git) Date: Wed, 2 Mar 2022 21:57:32 GMT Message-Id: <202203022157.222LvWfm065365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: bf75cc097a24 - stable/13 - rtsold: fix memory leak in script execution 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf75cc097a24947f9aa548351f689eb5ede149a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258256; 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=WzIX0R+j8JK36UEGpLtKI3QakjLyPF8osvorzKXZVio=; b=UaaXjr67L3e7EhWP1oyq2mU6m8eWS2+72lNd2OTlOC53q16AHFytOIomSewWlg4ryJcX6q lA49R260vhEjnP5Ygcd8pmMew/C3fwh2xmEjMh1ZT5BLqOinkemh9CA3W8fCM9rsz1mJSv EYoNqbxkwfb8SPUzosypqoxG4xrvsgE/5uAtKmhZ57JB3hhqExA7/hKMm6Cz+lgD/2tMrh Hijye6F66BDDd3b8R5dDc5LJ2Kfqj5fnkrLZubVrgw3Sf6VGRe81fpKqZ4ccgCxCEnmcLi jdrtbT2sOdzajmvSw1K7gDuaKUs6eEFbs2lhnUm2bxk2ymEdeC9Jb17NI4UKBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646258256; a=rsa-sha256; cv=none; b=ExgIO2PPpqaiBCPobSAqQDcXP1lWpaZCiKyxILXxHDgtdM7UPhtyOEMGmIxTR4MMNQDXhx XLEqzWRYu6gcRir4cQZNj0X27nEju+LjyDVes6dukXrtHrywV4h8315s1kquy8lZSBhbn2 gLGAZ7UVMjanfdM6S8oULxQP8tTo0NezvBOdK0WlgMh7ntnDnQSjzIK5p94lbS+nfjPehs b6N8ap5t1OUpfMbYfdF4NcRzUtIsKzi/Jm5TlVdOJ4wtGvJQNNXEukrJXtphEmBW0dzcsx 888H+cD/o5CpprESA+qyBvQhezqjnc3Qgx9iNQeV56KmYa6fUMqQrBZC7nHlsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=bf75cc097a24947f9aa548351f689eb5ede149a1 commit bf75cc097a24947f9aa548351f689eb5ede149a1 Author: Eric van Gyzen AuthorDate: 2022-02-23 16:49:12 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-02 21:56:31 +0000 rtsold: fix memory leak in script execution Since commit 04e9edb54428, rtsold has leaked the memory for the argument vector of every script it runs. Reported by: Coverity Reviewed by: markj Fixes: 04e9edb5442826a14616157962361ff81e4a38fe MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D34355 (cherry picked from commit 331b84b5db11b17d1bb0cdbce986efb587a1e5ee) --- usr.sbin/rtsold/cap_script.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/rtsold/cap_script.c b/usr.sbin/rtsold/cap_script.c index 5594d8ec8ec5..971d0bae4172 100644 --- a/usr.sbin/rtsold/cap_script.c +++ b/usr.sbin/rtsold/cap_script.c @@ -162,7 +162,7 @@ script_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin, const char *const *iargv, *const *scripts; char **argv; size_t argc, i, nscripts; - int fd, status; + int error, fd, status; if (strcmp(cmd, "script_wait") == 0) { /* Wait for the result of a previous "script_run" command. */ @@ -198,8 +198,10 @@ script_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin, memcpy(argv, iargv, sizeof(*argv) * argc); fd = script_run(argv); + error = errno; + free(argv); if (fd < 0) - return (errno); + return (error); (void)caph_rights_limit(fd, cap_rights_init(&rights, CAP_WRITE)); nvlist_move_descriptor(nvlout, "fd", fd);