From patchwork Thu Oct 13 17:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp411915wrs; Thu, 13 Oct 2022 11:09:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6bTgicDCya18QH/ccVd0e6ZYBSCL227Mojg+rpK9+cGpZGSqFXuX9m7xGZ+jqe7Kj+VGH1 X-Received: by 2002:a62:2985:0:b0:544:77d4:f43b with SMTP id p127-20020a622985000000b0054477d4f43bmr768128pfp.9.1665684571817; Thu, 13 Oct 2022 11:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684571; cv=none; d=google.com; s=arc-20160816; b=AcsDjzCdljE5BoLWNmPNgDKKw1xuZDn0RruXFv00hPYcRWRi+ki0jHnMTtJWKk1Dd3 lNn/ut6Y5ybnEim3EEf0MXwkAGap7MHPVaAeHbPGD8faeXXbJ+YsJ0CJhRNy9zVHa2al XW02oKcnQooet/+Avgu9pmJ0U0cJdSRGRQNI9FFwlmCU0ZGKSff3Vr8xgCLGQ+jXsO8s 5+96EcDpuzccLhQsuTbmZLBULfuBOHuBM+UpRrPiRnWzBH/WT2nAFKWhw5XiAsB0FMpv VGODHd2w1FzbVRp0k5l01MxR89a4MGNR+w+dV/5dNZTNDQJ+6BpHMnhKBy5nmzNl5ibA LHJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p81XiWD4xDZoZtZuA3weBXgvzM2QdNXufcxU+lW5xhg=; b=kwD+QNM41Apozb2QwsdIyhzDJXx5+SmLGJhjvjJlWHZzuPBpueKwIsCKUBqRWJK50z PdX0U46ZGebmYZhcdlP5RYVope+LrjulAp3MQzSKHnEniFANRtPBnHg6yIvQPKXNjJ3k iG570a/m16YxP+bGg6nYRUxjNR7RaIwBVaqm09p48B0wi75g4yG5FKDRe9O9q5zMXpur CLZ2VNKms7+e7VW1q6PfC05b24c16VXJMQ3I/GNlpZX7tnKDaYyH4PGDsOhR+uFqcucp NZVoQb1BSVmC+ZoCmXj8uWixG2X266i4V7uw+MIr3wRNFlFvVHXOPQDImSg6vXs+51ch O8fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UEKGKLjr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o2-20020a655bc2000000b004468fac0319si100305pgr.212.2022.10.13.11.09.18; Thu, 13 Oct 2022 11:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UEKGKLjr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230270AbiJMSJH (ORCPT + 99 others); Thu, 13 Oct 2022 14:09:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231680AbiJMSIc (ORCPT ); Thu, 13 Oct 2022 14:08:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 689DF169129; Thu, 13 Oct 2022 11:06:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5FAF561939; Thu, 13 Oct 2022 17:59:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61ED7C433D6; Thu, 13 Oct 2022 17:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683971; bh=Z8sVtd3LR/Wlz+vDZJp0UhS6gX76XtrAS7OWntiXtaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UEKGKLjrFSbH+2RpIQqW7gyxYfk+s/is5cxtaAWhAQuvK8lC65rW/hXH87OwEZ8Rt 40sRTCkypWuyElgr1+3IHQUTlTCS+BL7ncrlPs7mD6Vv16TmaycCOWKf+uJrGwHYi9 NMWPTj7oZT7ZkAG2LpuHsBlnn+vOcybLYr3JiaUc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hu Weiwen , Xiubo Li , Ilya Dryomov Subject: [PATCH 5.19 05/33] ceph: dont truncate file in atomic_open Date: Thu, 13 Oct 2022 19:52:37 +0200 Message-Id: <20221013175145.405997424@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175145.236739253@linuxfoundation.org> References: <20221013175145.236739253@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746596865906412941?= X-GMAIL-MSGID: =?utf-8?q?1746596865906412941?= From: Hu Weiwen commit 7cb9994754f8a36ae9e5ec4597c5c4c2d6c03832 upstream. Clear O_TRUNC from the flags sent in the MDS create request. `atomic_open' is called before permission check. We should not do any modification to the file here. The caller will do the truncation afterward. Fixes: 124e68e74099 ("ceph: file operations") Signed-off-by: Hu Weiwen Reviewed-by: Xiubo Li Signed-off-by: Ilya Dryomov [Xiubo: fixed a trivial conflict for 5.19 backport] Signed-off-by: Xiubo Li Signed-off-by: Greg Kroah-Hartman --- fs/ceph/file.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -740,6 +740,12 @@ int ceph_atomic_open(struct inode *dir, if (dentry->d_name.len > NAME_MAX) return -ENAMETOOLONG; + /* + * Do not truncate the file, since atomic_open is called before the + * permission check. The caller will do the truncation afterward. + */ + flags &= ~O_TRUNC; + if (flags & O_CREAT) { if (ceph_quota_is_max_files_exceeded(dir)) return -EDQUOT; @@ -807,9 +813,7 @@ retry: } set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags); - err = ceph_mdsc_do_request(mdsc, - (flags & (O_CREAT|O_TRUNC)) ? dir : NULL, - req); + err = ceph_mdsc_do_request(mdsc, (flags & O_CREAT) ? dir : NULL, req); if (err == -ENOENT) { dentry = ceph_handle_snapdir(req, dentry); if (IS_ERR(dentry)) {