From patchwork Thu Oct 13 17:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405125wrs; Thu, 13 Oct 2022 10:56:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5HOOh2w3LTZYn3ONXR6qBpQJ9dvgSTJdKNPsm+YJwLhX8+aT+ngebNyFXnS3Y6HtGAM28s X-Received: by 2002:a65:694b:0:b0:43b:f03d:32b0 with SMTP id w11-20020a65694b000000b0043bf03d32b0mr863912pgq.543.1665683818811; Thu, 13 Oct 2022 10:56:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683818; cv=none; d=google.com; s=arc-20160816; b=Um1efPsxaldUbzf5JFlR3/ICBDCiNZmmll0SUvYzOcQ9WtpJOcidUgaGM17dZ1iFOM lbBKjAJKjz1AzAAz090hWqec3OuT9nhkzoAxdDJlHLpT3moJMWO/9l9uG2o08hCraqNH tiHZCoJlUfX11I2FmcSjet1jiJI5KHmufQepJbQbFm1aP22y4n6Gcv5fdtcKzMRrtI5b nIqQqaJMvOT9mM+UDekuCC8FkGP2DUVCGDuJjN/Du8cZUfTuBnfREZNjFZk7gynmbsJx NzhQbhhislKRJb3F40k0AqMqTy8XpIMXcryrhT4xQc1RmKyyRcaaDaF9CcbJbUvShKSJ HKpA== 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=omeCWT7sPW4eZrhLD94Wg4QYTvIZmmNkupf9I/gMS8s=; b=M+IPCo9ja+qIvzkwBQqMaukOF0Y1kecxALlHNY4VpyraseoUE43W75z6YcksmbLtc1 t1wmFBiCtJZU0AfNTUsWmWDt9oM08bml/kjKXDjW/YRCeqyqTTRu1FvNEkeGUUBk6i3w 10CoZfMa83g19mfA6a/vJkLMWcEnTPHsCMObQT/MTov/0JALqss1fLoTYJ7eftOrwe5Z CQDQe/TBBbs2NakqB4JF9z9UiFFLJP2iCVh7xsuNsbiURYQHrIrHhaJf10AuzexLptP8 TCNLY0zPeF+4x1fkZqVup+F7hxDzzu6SKaVth+1nXHg/4rE2FanFL9Vyri6bL4JpRKSq YUPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RyX0i+z6; 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 o17-20020a170903211100b0017f95efe632si389035ple.8.2022.10.13.10.56.45; Thu, 13 Oct 2022 10:56:58 -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=RyX0i+z6; 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 S230034AbiJMR40 (ORCPT + 99 others); Thu, 13 Oct 2022 13:56:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230030AbiJMRz6 (ORCPT ); Thu, 13 Oct 2022 13:55:58 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D5801578B0; Thu, 13 Oct 2022 10:54:34 -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 sin.source.kernel.org (Postfix) with ESMTPS id 6DB90CE22D9; Thu, 13 Oct 2022 17:54:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61DE3C433D7; Thu, 13 Oct 2022 17:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683655; bh=lRzm0vRi2eUxz/z9bhopeMlcNJ3Sr4f8L3W4+Q8GECw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RyX0i+z6+RTN7F9EcBTkE9icI78ddBeSE24xO7rY2PhbYc+hq4Z4Nn+eqjFoUgM5m BZjtHqMJy0LDbBpwFRGGIHiaZdZe1HojiIYRn0/d/PIeJJJONkxLL/PkLF5MjhG9Tw knBWPnMmFnCMl7U3iHzvSTlYzxWS1s4jaXCZ4iuU= 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.4 21/38] ceph: dont truncate file in atomic_open Date: Thu, 13 Oct 2022 19:52:22 +0200 Message-Id: <20221013175144.981708426@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175144.245431424@linuxfoundation.org> References: <20221013175144.245431424@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?1746596075719136326?= X-GMAIL-MSGID: =?utf-8?q?1746596075719136326?= 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.10 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 @@ -452,6 +452,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; @@ -490,9 +496,7 @@ int ceph_atomic_open(struct inode *dir, req->r_parent = dir; 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); err = ceph_handle_snapdir(req, dentry, err); if (err) goto out_req;