From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4539DC282DD for ; Thu, 23 May 2019 19:33:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1310320879 for ; Thu, 23 May 2019 19:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639997; bh=i6pu/tpl1yXuj0Qw2aewDGV03/fwMjWACRX6Z8hAI/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FX/2cEYjQmgAbjddkVMl2O0TffOvMfBzewfwNCFi20b9dja/UxqwG1aV8eDm/kNQX OZJvEVCA5gIZPYyPZ8ERB7F21J3tQheQeKefi8zt10Y1LoY8N+ij3ENf6HCNdtCgHj H0q2DHrWxVZvejFndY0uGkD28sehsIO4FyOqtXn4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391622AbfEWT3Q (ORCPT ); Thu, 23 May 2019 15:29:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:42314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391922AbfEWT3Q (ORCPT ); Thu, 23 May 2019 15:29:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9FFE820879; Thu, 23 May 2019 19:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639756; bh=i6pu/tpl1yXuj0Qw2aewDGV03/fwMjWACRX6Z8hAI/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hk0Ky8oWtuVbTyRx/o0vR/GvYxzdcuwgHQ2K3VcjVzJwuwD2ggh2TilEvQjlh9/9a K2mKcp8KgBx+/UiVJdxB3zHgMtfeAxjJsH77h8FNvDWIwxBLYBjT1nSwgxKy42Mxjz G/Jwab1yGxf9fhd7uaSPBgD7hrnlQa5sStcIV16c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Bo , Miklos Szeredi Subject: [PATCH 5.1 067/122] fuse: honor RLIMIT_FSIZE in fuse_file_fallocate Date: Thu, 23 May 2019 21:06:29 +0200 Message-Id: <20190523181713.573255496@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181705.091418060@linuxfoundation.org> References: <20190523181705.091418060@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Liu Bo commit 0cbade024ba501313da3b7e5dd2a188a6bc491b5 upstream. fstests generic/228 reported this failure that fuse fallocate does not honor what 'ulimit -f' has set. This adds the necessary inode_newsize_ok() check. Signed-off-by: Liu Bo Fixes: 05ba1f082300 ("fuse: add FALLOCATE operation") Cc: # v3.5 Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/fuse/file.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -3044,6 +3044,13 @@ static long fuse_file_fallocate(struct f } } + if (!(mode & FALLOC_FL_KEEP_SIZE) && + offset + length > i_size_read(inode)) { + err = inode_newsize_ok(inode, offset + length); + if (err) + return err; + } + if (!(mode & FALLOC_FL_KEEP_SIZE)) set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);