From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6B13DBA49 for ; Tue, 7 Mar 2023 18:40:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C55DEC433EF; Tue, 7 Mar 2023 18:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678214435; bh=RZ5bfbO1ah2+t1w4mLCtDOfadBmUwEphvgprnu5E+o4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kV1M5FQxGvYNAsEh9H9uSe/T0hI9QlZEsVy8GbvMWV5Drkj8yg5HDlL6Bvtlftllj D4Ghp5ZS6kMq3D7mgUSLfRLLuvJibLms/njWqd0lkmSsXEpSF0bry5t/ZMotLRZGS8 8GbCkuvSHc6B/riw8QSm0fpsarBqjBX7BYzCUf5g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiubo Li , Jeff Layton , Ilya Dryomov Subject: [PATCH 6.1 821/885] ceph: update the time stamps and try to drop the suid/sgid Date: Tue, 7 Mar 2023 18:02:35 +0100 Message-Id: <20230307170037.531393552@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Xiubo Li commit e027253c4b77d395798600a90b6a96fe4adf4d5e upstream. The fallocate will try to clear the suid/sgid if a unprevileged user changed the file. There is no POSIX item requires that we should clear the suid/sgid in fallocate code path but this is the default behaviour for most of the filesystems and the VFS layer. And also the same for the write code path, which have already support it. And also we need to update the time stamps since the fallocate will change the file contents. Cc: stable@vger.kernel.org Link: https://tracker.ceph.com/issues/58054 Signed-off-by: Xiubo Li Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- fs/ceph/file.c | 8 ++++++++ 1 file changed, 8 insertions(+) --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -2095,6 +2095,9 @@ static long ceph_fallocate(struct file * loff_t endoff = 0; loff_t size; + dout("%s %p %llx.%llx mode %x, offset %llu length %llu\n", __func__, + inode, ceph_vinop(inode), mode, offset, length); + if (mode != (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) return -EOPNOTSUPP; @@ -2129,6 +2132,10 @@ static long ceph_fallocate(struct file * if (ret < 0) goto unlock; + ret = file_modified(file); + if (ret) + goto put_caps; + filemap_invalidate_lock(inode->i_mapping); ceph_fscache_invalidate(inode, false); ceph_zero_pagecache_range(inode, offset, length); @@ -2144,6 +2151,7 @@ static long ceph_fallocate(struct file * } filemap_invalidate_unlock(inode->i_mapping); +put_caps: ceph_put_cap_refs(ci, got); unlock: inode_unlock(inode);