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=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no 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 43D72C433E1 for ; Wed, 12 Aug 2020 21:04:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1CCBA20B1F for ; Wed, 12 Aug 2020 21:04:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266283; bh=TZpURP90uyUCyCAAsfIEFImavCnK09ZwCnz33EqkjOU=; h=Date:From:To:Subject:Reply-To:List-ID:From; b=SgPHoWivjKv096FZ0VfoX+gV24w8+q7btan78ylE6uuUcYylKBe9/taHJomk75VGJ JIMQqy5HVRcYwL9nAl2JiPX8c+FiVb8Xw0n90kIAHY9nnPRNxucgcoXPM2Itsdv1B4 +45Z1R4nU/Mghqgh5q/EppIW4ZM2uQANwOAMYx7c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726554AbgHLVEm (ORCPT ); Wed, 12 Aug 2020 17:04:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:57396 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726531AbgHLVEm (ORCPT ); Wed, 12 Aug 2020 17:04:42 -0400 Received: from localhost.localdomain (c-71-198-47-131.hsd1.ca.comcast.net [71.198.47.131]) (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 62DF92080C; Wed, 12 Aug 2020 21:04:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597266281; bh=TZpURP90uyUCyCAAsfIEFImavCnK09ZwCnz33EqkjOU=; h=Date:From:To:Subject:From; b=SWVskJFTaaCao6STa6yFHviqyTNNScjWf3GofAi+y8yLjyNqhzWkH7XeKQatpJ9aT ZURc3l7lG6Z3a3GrCg8fxzlvC/0CC6J9Q1zL2liaRcsIi6UiO5G0zyf782J2XzHw7f vB1wZTABfcFXN9P08rVj71oiy90zhhXWwHh538HI= Date: Wed, 12 Aug 2020 14:04:41 -0700 From: akpm@linux-foundation.org To: anenbupt@gmail.com, ebiggers@google.com, mm-commits@vger.kernel.org, viro@zeniv.linux.org.uk Subject: [merged] fs-minix-set-s_maxbytes-correctly.patch removed from -mm tree Message-ID: <20200812210441.OEvEz8kES%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Sender: mm-commits-owner@vger.kernel.org Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: fs/minix: set s_maxbytes correctly has been removed from the -mm tree. Its filename was fs-minix-set-s_maxbytes-correctly.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Eric Biggers Subject: fs/minix: set s_maxbytes correctly The minix filesystem leaves super_block::s_maxbytes at MAX_NON_LFS rather than setting it to the actual filesystem-specific limit. This is broken because it means userspace doesn't see the standard behavior like getting EFBIG and SIGXFSZ when exceeding the maximum file size. Fix this by setting s_maxbytes correctly. Link: http://lkml.kernel.org/r/20200628060846.682158-5-ebiggers@kernel.org Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Eric Biggers Cc: Alexander Viro Cc: Qiujun Huang Signed-off-by: Andrew Morton --- fs/minix/inode.c | 12 +++++++----- fs/minix/itree_v1.c | 2 +- fs/minix/itree_v2.c | 3 +-- fs/minix/minix.h | 1 - 4 files changed, 9 insertions(+), 9 deletions(-) --- a/fs/minix/inode.c~fs-minix-set-s_maxbytes-correctly +++ a/fs/minix/inode.c @@ -150,8 +150,10 @@ static int minix_remount (struct super_b return 0; } -static bool minix_check_superblock(struct minix_sb_info *sbi) +static bool minix_check_superblock(struct super_block *sb) { + struct minix_sb_info *sbi = minix_sb(sb); + if (sbi->s_imap_blocks == 0 || sbi->s_zmap_blocks == 0) return false; @@ -161,7 +163,7 @@ static bool minix_check_superblock(struc * of indirect blocks which places the limit well above U32_MAX. */ if (sbi->s_version == MINIX_V1 && - sbi->s_max_size > (7 + 512 + 512*512) * BLOCK_SIZE) + sb->s_maxbytes > (7 + 512 + 512*512) * BLOCK_SIZE) return false; return true; @@ -202,7 +204,7 @@ static int minix_fill_super(struct super sbi->s_zmap_blocks = ms->s_zmap_blocks; sbi->s_firstdatazone = ms->s_firstdatazone; sbi->s_log_zone_size = ms->s_log_zone_size; - sbi->s_max_size = ms->s_max_size; + s->s_maxbytes = ms->s_max_size; s->s_magic = ms->s_magic; if (s->s_magic == MINIX_SUPER_MAGIC) { sbi->s_version = MINIX_V1; @@ -233,7 +235,7 @@ static int minix_fill_super(struct super sbi->s_zmap_blocks = m3s->s_zmap_blocks; sbi->s_firstdatazone = m3s->s_firstdatazone; sbi->s_log_zone_size = m3s->s_log_zone_size; - sbi->s_max_size = m3s->s_max_size; + s->s_maxbytes = m3s->s_max_size; sbi->s_ninodes = m3s->s_ninodes; sbi->s_nzones = m3s->s_zones; sbi->s_dirsize = 64; @@ -245,7 +247,7 @@ static int minix_fill_super(struct super } else goto out_no_fs; - if (!minix_check_superblock(sbi)) + if (!minix_check_superblock(s)) goto out_illegal_sb; /* --- a/fs/minix/itree_v1.c~fs-minix-set-s_maxbytes-correctly +++ a/fs/minix/itree_v1.c @@ -29,7 +29,7 @@ static int block_to_path(struct inode * if (block < 0) { printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n", block, inode->i_sb->s_bdev); - } else if (block >= (minix_sb(inode->i_sb)->s_max_size/BLOCK_SIZE)) { + } else if (block >= inode->i_sb->s_maxbytes/BLOCK_SIZE) { if (printk_ratelimit()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n", --- a/fs/minix/itree_v2.c~fs-minix-set-s_maxbytes-correctly +++ a/fs/minix/itree_v2.c @@ -32,8 +32,7 @@ static int block_to_path(struct inode * if (block < 0) { printk("MINIX-fs: block_to_path: block %ld < 0 on dev %pg\n", block, sb->s_bdev); - } else if ((u64)block * (u64)sb->s_blocksize >= - minix_sb(sb)->s_max_size) { + } else if ((u64)block * (u64)sb->s_blocksize >= sb->s_maxbytes) { if (printk_ratelimit()) printk("MINIX-fs: block_to_path: " "block %ld too big on dev %pg\n", --- a/fs/minix/minix.h~fs-minix-set-s_maxbytes-correctly +++ a/fs/minix/minix.h @@ -32,7 +32,6 @@ struct minix_sb_info { unsigned long s_zmap_blocks; unsigned long s_firstdatazone; unsigned long s_log_zone_size; - unsigned long s_max_size; int s_dirsize; int s_namelen; struct buffer_head ** s_imap; _ Patches currently in -mm which might be from ebiggers@google.com are