From owner-svn-src-head@freebsd.org Mon Jun 1 15:32:14 2020 Return-Path: Delivered-To: svn-src-head@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 5CFA6339741; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49bK0t1tpTz46Kd; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@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 3BF4AD7C2; Mon, 1 Jun 2020 15:32:14 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 051FWEJx068123; Mon, 1 Jun 2020 15:32:14 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 051FWEAJ068122; Mon, 1 Jun 2020 15:32:14 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202006011532.051FWEAJ068122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 1 Jun 2020 15:32:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361694 - head/lib/libcasper/services/cap_fileargs X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/lib/libcasper/services/cap_fileargs X-SVN-Commit-Revision: 361694 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2020 15:32:14 -0000 Author: markj Date: Mon Jun 1 15:32:13 2020 New Revision: 361694 URL: https://svnweb.freebsd.org/changeset/base/361694 Log: cap_fileargs: Fix a descriptor leak in the service process. The service handler for fileargs_open() tries to pre-open multiple files and pass descriptors for each back to the sandboxed process in a single message. This is to amortize the cost of round-trips between the two processes. The service process adds a "cache" nvlist to the reply to "open", containing file descriptors for pre-opened files. However, when adding that nvlist to the reply, it was making a copy, effectively leaking the cached descriptors. While here, fix spelling in a local variable name. PR: 241226 Reviewed by: oshogbo MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D25095 Modified: head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Modified: head/lib/libcasper/services/cap_fileargs/cap_fileargs.c ============================================================================== --- head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Mon Jun 1 10:27:05 2020 (r361693) +++ head/lib/libcasper/services/cap_fileargs/cap_fileargs.c Mon Jun 1 15:32:13 2020 (r361694) @@ -500,7 +500,7 @@ open_file(const char *name) static void fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *limits, - const char *curent_name) + const char *current_name) { int type, i, fd; void *cookie; @@ -527,9 +527,9 @@ fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *l break; } - if (type != NV_TYPE_NULL || - (curent_name != NULL && strcmp(fname, curent_name) == 0)) { - curent_name = NULL; + if (type != NV_TYPE_NULL || (current_name != NULL && + strcmp(fname, current_name) == 0)) { + current_name = NULL; i--; continue; } @@ -553,7 +553,7 @@ fileargs_add_cache(nvlist_t *nvlout, const nvlist_t *l nvlist_add_binary(new, "stat", &sb, sizeof(sb)); } - nvlist_add_nvlist(nvlout, fname, new); + nvlist_move_nvlist(nvlout, fname, new); } cacheposition = cookie; lastname = fname;