From nobody Tue Feb 15 17:51:32 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 8192B19CDE0E; Tue, 15 Feb 2022 17:51:33 +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 4JypYc6PD9z4XMj; Tue, 15 Feb 2022 17:51:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947493; 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=pXIVUAgH7G43/r1KP4lqVyxP+jLrwfjR+DQfajpMBgA=; b=dvVNRwU8nKUaFAh4TNBZrTWE1wponcGZuU6aZWOEb1qxpmvt0p9+E2D8zX3CLpVFgvrKXW h1MXqHg0jmGb+ofnaUkjs+3Pj9jnuDw+9XK+pJp7IixFl/2Cnt+3JO6SF3zo3D4/biKHVr XiTA9X8LO8XrGeMYi/2U5YfGOjSwESAuNTc0hZoSaxlQvbUPpJlP6jLRJgP4FlD/AFqFEw rwdl2lSEcU54Gp8PfoPXZp9RjPkfFCMUe8qNeY94B2DkEFq3FpMdmNWP4J9IqDkWA7wNPa CbDOeObCJIdY8SuKealtLVkwEKY3Ra2fiLh4EozQtuolSDM7v3PQFiTVm8C9aA== 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 B10F6268B5; Tue, 15 Feb 2022 17:51:32 +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 21FHpWb5016198; Tue, 15 Feb 2022 17:51:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FHpW7B016197; Tue, 15 Feb 2022 17:51:32 GMT (envelope-from git) Date: Tue, 15 Feb 2022 17:51:32 GMT Message-Id: <202202151751.21FHpW7B016197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: ec12b4f4ff38 - main - fd: add missing seqc to dupfdopen 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec12b4f4ff3817b75f4c23ee2acd14fdb0ffa20a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644947493; 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=pXIVUAgH7G43/r1KP4lqVyxP+jLrwfjR+DQfajpMBgA=; b=hWp9mYVH0X6g3xYMY88Ee1o5RtLEzpJdZJGme8rCSuThsLwD6eSHeig1wm2cAABr6Fen82 8dWS3V3LQBn8R/p3P9uKa4gSL7HlEUIY8p0zHPB7Vh4/hyVmd6+CyRxKYiQ5SNQlSu0foH e2/xipiiDZ1MXmh6BATtZ5R383NrzPWage958J3U/ML8Wl3wSNMGal1zi/svXXtSwkap2l 4TE/SIXEblmypOe7BdmAJi7MJIniwx1I2uNriKfuvdqHopwVQ6K9UR7lh0uyFniIX2VWwY cYajb9X4kdRAUJ0+Pkcvsyr6Ta5dH0QZXDI5m3b+TJ9csoG6NvDqZ4x5ofZY3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644947493; a=rsa-sha256; cv=none; b=FyfnTwHDTZHPwoGwwDSFICqgeL8LVdsAXZqS/8fTs5taXK1/qxo1H52WKIjBi3FUNlnlSm Y5qsPQwznfO/L6ImxinXvNUn05+BJNxTqzn2pYWhJFWTQKRIEzc4n2Zw8H7+S9rCi+9gwu T9kiM53qZoNSJBNZZG2gPmf8CLC3sT9YPLkWQlRf+lMgeaTgn0TLNIo2ziAgAi4jCUAtDV ukyYZ0DePkpF+zzEMckxT8R24vsNQE1B1WCe5JyX76Y/sQEERbiYpMTTfxJioVIYNRi1b9 IZykXdxfS1swkrSw5Tv8y4n9DfTHcW7nSO9Rjq6BrsXxNB3xW8HJlyi3AbzXTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ec12b4f4ff3817b75f4c23ee2acd14fdb0ffa20a commit ec12b4f4ff3817b75f4c23ee2acd14fdb0ffa20a Author: Mateusz Guzik AuthorDate: 2022-02-14 15:33:24 +0000 Commit: Mateusz Guzik CommitDate: 2022-02-15 17:51:08 +0000 fd: add missing seqc to dupfdopen --- sys/kern/kern_descrip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index e7b3191bae30..57e0d9dee671 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -3642,6 +3642,7 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode, newfde = &fdp->fd_ofiles[indx]; oldfde = &fdp->fd_ofiles[dfd]; #ifdef CAPABILITIES + seqc_write_begin(&oldfde->fde_seqc); seqc_write_begin(&newfde->fde_seqc); #endif memcpy(newfde, oldfde, fde_change_size); @@ -3649,6 +3650,7 @@ dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode, fdunused(fdp, dfd); #ifdef CAPABILITIES seqc_write_end(&newfde->fde_seqc); + seqc_write_end(&oldfde->fde_seqc); #endif break; }