Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp413476pxa; Fri, 21 Aug 2020 10:25:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRJKEY54fZiZnpyZW7EC5QKmIVkVc/ep0nQwBcuIJQMMi5M1ZwLW77qzjE20KxE/vjHmYf X-Received: by 2002:aa7:d6c7:: with SMTP id x7mr3859802edr.167.1598030745911; Fri, 21 Aug 2020 10:25:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030745; cv=none; d=google.com; s=arc-20160816; b=WqzwXzdm22S0yhG9QHgVbbTboe6nwvKoOZHJg8Fvi2NZvenKiGmWyOGQi30jVgZAI5 Y9dzHayU75V7APwjvDRMguXH6TejYpbdQ14X6410DSyi0YTv5HwemE8ae2xiqnDfGu8o E37zgQW1ah2hUi+y8jl2q4Kc/aKE8y4jXAf2+/n7Lv++Mf6fOHc7okPuN9G5BHdf/qvj ZWSLOLxqpKpzpxjLx8arvLHqUEuAXwPvMY+9jK58QQZihJzqLEy8fp10gFA+M8w7sNMn XudP3hFlH62O8REtP19tHvxF+XMJEwxbHlBVohyyc1awrmF+Cbin7d8XxUEoZoWPBoq0 k6cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=seKIaN0YOu5ZqR8tdX/guRgWyhCHfarQZIlOFipwPOQ=; b=ojwm5eIXX1q0N+Ig5UYRp7kJ5TGpCIZIJLfNQ/EPJp0bAKYZ3rX9RSJku8Ttw6feEK IPz+z5nzbGB/pOFGpvNmSi1TXxaJEWgGlhFi/rnL1pk8c8QHegf1YSg1OK8Dh6Iyqw/o aFmsHvgT0QD/+2CrrK9PMo2qg850CAguaCg2E5MsLAFGhqD8tnvZZ7m61u+Dzype3vDJ H0Q6etVkG0q3DTuMfubtfuRcOBecIj8Y3ZAb+HWiVcVNhtrPbBOLQCsj3XKfE+YAyi/n EfubTqWf5buQBC4otEhdcY7SOYCMGeKp+mdsB9zmB9iNQJiS/i1Loc6XY65PZDSLAtqs yzQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ygtn64Ml; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e13si1629367edy.306.2020.08.21.10.25.21; Fri, 21 Aug 2020 10:25:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ygtn64Ml; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728975AbgHURWg (ORCPT + 99 others); Fri, 21 Aug 2020 13:22:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:48544 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726989AbgHUQPo (ORCPT ); Fri, 21 Aug 2020 12:15:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 97DCC214F1; Fri, 21 Aug 2020 16:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026543; bh=YH+ZfWRuTKPhQSveWFLTA34VHtcTmqp1ZmpGVqjZ3+k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ygtn64Ml5XDBEUmSSDRUY+UkhzFiFSPL991D71HlyFKgfHeSq2caZgqdcIn/d4rE8 7FiTtGkqYAUpknplH9GWxcnND6LJ44nL2b7+nDfXAfzgeelcpgvfU/rqcvVjqOhEhN QK1CsS3mCHx9k2k0VUWsWdupEhi4/YjWoUSxC/dg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mike Kravetz , syzbot+d6ec23007e951dadf3de@syzkaller.appspotmail.com, Amir Goldstein , Andrew Morton , Miklos Szeredi , Al Viro , Matthew Wilcox , Colin Walters , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 5.8 62/62] hugetlbfs: prevent filesystem stacking of hugetlbfs Date: Fri, 21 Aug 2020 12:14:23 -0400 Message-Id: <20200821161423.347071-62-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mike Kravetz [ Upstream commit 15568299b7d9988063afce60731df605ab236e2a ] syzbot found issues with having hugetlbfs on a union/overlay as reported in [1]. Due to the limitations (no write) and special functionality of hugetlbfs, it does not work well in filesystem stacking. There are no know use cases for hugetlbfs stacking. Rather than making modifications to get hugetlbfs working in such environments, simply prevent stacking. [1] https://lore.kernel.org/linux-mm/000000000000b4684e05a2968ca6@google.com/ Reported-by: syzbot+d6ec23007e951dadf3de@syzkaller.appspotmail.com Suggested-by: Amir Goldstein Signed-off-by: Mike Kravetz Signed-off-by: Andrew Morton Acked-by: Miklos Szeredi Cc: Al Viro Cc: Matthew Wilcox Cc: Colin Walters Link: http://lkml.kernel.org/r/80f869aa-810d-ef6c-8888-b46cee135907@oracle.com Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- fs/hugetlbfs/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index ef5313f9c78fe..f936bcf02cce7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1364,6 +1364,12 @@ hugetlbfs_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic = HUGETLBFS_MAGIC; sb->s_op = &hugetlbfs_ops; sb->s_time_gran = 1; + + /* + * Due to the special and limited functionality of hugetlbfs, it does + * not work well as a stacking filesystem. + */ + sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH; sb->s_root = d_make_root(hugetlbfs_get_root(sb, ctx)); if (!sb->s_root) goto out_free; -- 2.25.1