From nobody Thu Nov 23 04:01:05 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 4SbPYG1FrBz51C2G; Thu, 23 Nov 2023 04:01:06 +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 4SbPYF6gVMz4PKp; Thu, 23 Nov 2023 04:01:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700712065; 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=wGCV5ojvavGsirvLgCjW2Jor9sgVQpsYup6XvUB+evE=; b=gFymZJkakyhS4LFi/cEJh3++HJxqm/EZF02SvbYhKJjw6H7zdlHW/wbeW2A9fhd2tl+tIa l8Hq3kKN0xUZ1cxd91C4KruDrhepM3scx/1mtfsmCP9dPikZpgvEMyl6g8Ves01anXt5TD EroxCwLr4zWVBVXFT1+lFbausZGl+CwQe+ze6s43C6uUzHsoWSkJD3CUUdNOXLGA6aIoo9 PRYMmnyTXz2DUFjxp0PMrQNBRkp+xbehyUxTlaLrX2m6dGmj1KNnPTxPNp6ZtjKQ1sGPm+ udE02RWeNj92V43UDZP+SqOsmnVC6o22Gu+Jqup/I39ZRvhObNXFw/uuC30JvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700712065; 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=wGCV5ojvavGsirvLgCjW2Jor9sgVQpsYup6XvUB+evE=; b=btmnE/TJj1LejhLYKaOKG5Ip+46ONsKlYppcA9MHUwXo+2rt2l42xHd5n5zHugqulOjwZj uZ50ihhcCzYCTJNIP4E9/2a+6IgpU6xPb3jeC12D3FkajGmXT1WxuHJNzhDORf/l0Cm6Ru +IeS4X8tX+mfP0IVyzchIxmpKFtIGvkeM09L8vTks3Huywu4CzsBumMvt9jTWxHkcE2veU H0ighzYmXpjrMXDpFPIv6gyU4htlpscSXMosccQCtj/XQATZoafSn80Zt0Y+8018SHaSCV IUMTTY12taq0WMrMkZsAJJB70sGVzViSa/67dIFWH4JkuewjX/tS2X++mP1pew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700712065; a=rsa-sha256; cv=none; b=Xa9sMUrQHrMTpa7699X+mKf6INxGl7Glf3b1+xSqZisMhIUnOxXGkzJdiBnwNhUqICnU+c bHYeRY3Sb9H6CvAFtplj7TNOIx04Cddkj27skLiBUeUR4DFwc10pjV7WJVGmbRvlkICaa/ OIijGnhQIkolN73miGnbV8Yhc6+ohnPb/i7BNyEvBUxwuGQS9EBUbV+SBnkpopeGXW4qWC Cm3smjcj2Tg7FTJrqbuDg8dxF98xpSOa94/jRZAFwv9px8AGJedlPED2zLkV5/qt82oxpq /R2EJy6egOCxxjxI+6wFzCraYC2mHu20dgAgBM0pmnpfDsCTkXaYdpzuXy1wkQ== 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 4SbPYF5Zp0zmQV; Thu, 23 Nov 2023 04:01:05 +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 3AN415Ct098775; Thu, 23 Nov 2023 04:01:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN4151D098772; Thu, 23 Nov 2023 04:01:05 GMT (envelope-from git) Date: Thu, 23 Nov 2023 04:01:05 GMT Message-Id: <202311230401.3AN4151D098772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7f8ec7791b73 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f8ec7791b73b79d608b6670646a16fbce392c0e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f8ec7791b73b79d608b6670646a16fbce392c0e commit 7f8ec7791b73b79d608b6670646a16fbce392c0e Author: Konstantin Belousov AuthorDate: 2023-11-14 22:49:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-23 04:00:36 +0000 fuse_vnop_copy_file_range(): add safety (cherry picked from commit 4c6cded2166111079c6b5e8b2353171dcc7ed0c4) --- 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;