From nobody Thu Nov 16 20:11:50 2023 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 4SWWQb1gjpz5133g; Thu, 16 Nov 2023 20:11:51 +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 4SWWQb13fhz3fY9; Thu, 16 Nov 2023 20:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700165511; 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=Di5ro+W+yvrzRMOf6D/RWxgZNcOgZ+Q6+M1L/Z91IGo=; b=lwCafAFkIrVaJCHXFCSbvBQal0uQP6Iiq0BPTBcre6b+PF1+qDtzycTPwCgYY0cu2ZWXu9 C+V+agNC0oHI8ghC2kafL2zGZ8BG+KzxIqsYL8EHO6Hs/+fV4dy7EIu6DVZZFzsbzdrc0z Gd05mn3mSlWyE+tvHzAQ5p61fdNOpc5SEUSe9yrHCFkUqVC8kkMCM6XJuXJF57ivh+Cv9X BSJ5YaYw5yrisum0dUKzaRiWHQVN9HKGUTFiTHdH2G2+vNGxHmdUzryWlPH4gDkbuZU+mp JA2imX5Ww90UovFYh6XpPteOlETXADbndsf724kM1hJKMriJPZhPUdIFm2fYWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700165511; 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=Di5ro+W+yvrzRMOf6D/RWxgZNcOgZ+Q6+M1L/Z91IGo=; b=XxePuxcuBeJnQd1Ww2oK+7kye3FL3/vE4A8fJ7Jeevf1F9jhx6aX/ESMJO3uFvkDaX5EC+ 55skBzkow4SsSzZSdpUBw1TJ9kStj816LG16BMMo/rv8+JR5X9Zpm1KynmFUOIXSOUUXxa O7v/qhfzJBC8psD3FmupbUxHRNyoTzWfRqcfIjOT3fh7QzAX4m3EpefRSRmJIRJUjxcKPK dyxDVaAj2DQ+Mvw6/V7lbr4TmOk7ESQ/1BZNfZ+lEVyaYSAKswgcUOVDMvkVCpJIe+AagI rdM6qBm9jsB6QVJBd4dH8cesVBAS1RTovcD3D2KBOzbMxnH73Vv9suuoVzsPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700165511; a=rsa-sha256; cv=none; b=NK6mraJNIB2/hU4x4cXIU+jKsZY1yWp3lpPzndFKrOoaPxucUcvrRUY0WwrMJmcb/t3qFc scmTRgGcJ1c942xJ2iLptsDVzUwL9Kq7t22c2BuJqRQNnebBQEGsixx1xLyqE6IDsZIUw9 qx6KMP3m6Rik+VMxo10tsrGNBBpGjpmttBD7Ajvn+9vVe6BvwjytZ8F8DuoRP+N8Z48pP8 3Q2g5qUqd2NmYTDSY1XWdOhZTqGWJeheLZwxT174++FrRwEV8eQod2NMw8zmlppUp6oehL ipHin1qudkZ6zDqNL57OIUS9Ga9c5hohVom8nNOkXgnz/wvpYFPBmDG9kiFAhg== 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 4SWWQb04z8z6P; Thu, 16 Nov 2023 20:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AGKBoHL082660; Thu, 16 Nov 2023 20:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGKBoJf082657; Thu, 16 Nov 2023 20:11:50 GMT (envelope-from git) Date: Thu, 16 Nov 2023 20:11:50 GMT Message-Id: <202311162011.3AGKBoJf082657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4c6cded21661 - main - fuse_vnop_copy_file_range(): add safety 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c6cded2166111079c6b5e8b2353171dcc7ed0c4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c6cded2166111079c6b5e8b2353171dcc7ed0c4 commit 4c6cded2166111079c6b5e8b2353171dcc7ed0c4 Author: Konstantin Belousov AuthorDate: 2023-11-14 22:49:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-16 20:10:31 +0000 fuse_vnop_copy_file_range(): add safety v_mount for unlocked vnode could be NULL, check for it. Explain why it is safe to access fs-specific data for mp if it is read as non-NULL. Reviewed by: asomers, jah Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42625 --- sys/fs/fuse/fuse_vnops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index aead188276ec..b9e4e48e6dbd 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -861,7 +861,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) pid_t pid; int err; - if (mp != vnode_mount(outvp)) + if (mp == NULL || mp != vnode_mount(outvp)) goto fallback; if (incred->cr_uid != outcred->cr_uid) @@ -870,6 +870,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) if (incred->cr_groups[0] != outcred->cr_groups[0]) goto fallback; + /* Caller busied mp, mnt_data can be safely accessed. */ if (fsess_not_impl(mp, FUSE_COPY_FILE_RANGE)) goto fallback;