Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp590726img; Fri, 22 Mar 2019 04:42:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDsTs4SSqZ0p2Owi1nlVJZs4GL4loof7N4DaRMi2kAChKXy+OCNDX7+9IHGYz2pG/gUbox X-Received: by 2002:a17:902:b68b:: with SMTP id c11mr9025054pls.79.1553254920759; Fri, 22 Mar 2019 04:42:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553254920; cv=none; d=google.com; s=arc-20160816; b=QOj8oIh8MGhWRhIavaHM444BIDGFhZJxJFc38RWkd37Y02RO+AmB39lXTL7g/CtsCB rNsy9yh2Z+WbMGlPhXFqxTYRARnKJqvmEL0F26EuZIuy468MWehBhF4bwwYIHpRiqeiq v18uL1NpXEfKd6dqa1PsRaQsu6qLtydeRAUZCGHhs3e5XPqncNxHzTK6XaJwsx7tiTGU 46fPBR4TI9ohAWu/RGirWLHBx1vyT+DUBoIQpfrhhykPfejTwXjri8Y3/4J+D8cz5zew +Q6qb5U9R+I/ohNzuquFaKuaNAhLrSmCrzzZT2wPGhfmTUTvEKFxmp7IMAjOhHpr15fH 3kFw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wL/I6bt1axAhjZ/B4HfBpd6X8Q7C8eyUwyXVWk0TEvU=; b=LVsW/OJ42iPd/nCX9PjjcycY3/Mbvjrvo9KTi8H6KbuhbB2639ybLEgNpCqLRCR2CE /JrtDljG6MSKSGnMaQsYMqZC9KPvivRRA9qsKJs8iDANVFnWg05/O6LRCzSgbsHxTeFO ezK1PIhbXz3oU0qKzpm0nz0BdDkz/N4Ez/Ab+SqlmF3ODFxpZJXK1YvUi64hpLkN90hX EVRUkKa1o0SZmIA4CZQ3y7GKTp+EkJRyul6qiCHT7qVJ94JPvkClgwiUH9N1K3JMz0h4 wRJM5Hsrs6XKAdyKxIqmxSqDDAWdb2m9yT5QaxrPFDDSYIY6BPxFXAqOVS7qy7mEpie3 I7jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Zq5LJJWI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o7si6459888pgh.273.2019.03.22.04.41.43; Fri, 22 Mar 2019 04:42:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Zq5LJJWI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731340AbfCVLk7 (ORCPT + 99 others); Fri, 22 Mar 2019 07:40:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:42942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730969AbfCVLk5 (ORCPT ); Fri, 22 Mar 2019 07:40:57 -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 2DDD92082C; Fri, 22 Mar 2019 11:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553254856; bh=WH1abnLs9d9eTBONZcpId1Pcg+HeZQsgTWcLUtFI1as=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zq5LJJWIE1p/tuBLjJlT8DmOu0w3X8oXb+g1ty0bPAYifW8x+X5P1DEhsHUAq8Fhp czmWL3g3fLSwgJCizilQS8zgZ9DiAymq8UtNM5PR7ZkQF8S4oRPcfLKBQzQgHFlRwZ UT+zm0RF2ZLFRFYZQPjx+SQms7lps61SNLMwovCs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Darrick J. Wong" , Hugh Dickins , Matej Kupljen , Al Viro , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 4.9 032/118] tmpfs: fix link accounting when a tmpfile is linked in Date: Fri, 22 Mar 2019 12:15:04 +0100 Message-Id: <20190322111218.430837578@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111215.873964544@linuxfoundation.org> References: <20190322111215.873964544@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 1062af920c07f5b54cf5060fde3339da6df0cf6b ] tmpfs has a peculiarity of accounting hard links as if they were separate inodes: so that when the number of inodes is limited, as it is by default, a user cannot soak up an unlimited amount of unreclaimable dcache memory just by repeatedly linking a file. But when v3.11 added O_TMPFILE, and the ability to use linkat() on the fd, we missed accommodating this new case in tmpfs: "df -i" shows that an extra "inode" remains accounted after the file is unlinked and the fd closed and the actual inode evicted. If a user repeatedly links tmpfiles into a tmpfs, the limit will be hit (ENOSPC) even after they are deleted. Just skip the extra reservation from shmem_link() in this case: there's a sense in which this first link of a tmpfile is then cheaper than a hard link of another file, but the accounting works out, and there's still good limiting, so no need to do anything more complicated. Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1902182134370.7035@eggly.anvils Fixes: f4e0c30c191 ("allow the temp files created by open() to be linked to") Signed-off-by: Darrick J. Wong Signed-off-by: Hugh Dickins Reported-by: Matej Kupljen Acked-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/shmem.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 9b17bd4cbc5e..214773472530 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2902,10 +2902,14 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr * No ordinary (disk based) filesystem counts links as inodes; * but each new link needs a new dentry, pinning lowmem, and * tmpfs dentries cannot be pruned until they are unlinked. + * But if an O_TMPFILE file is linked into the tmpfs, the + * first link must skip that, to get the accounting right. */ - ret = shmem_reserve_inode(inode->i_sb); - if (ret) - goto out; + if (inode->i_nlink) { + ret = shmem_reserve_inode(inode->i_sb); + if (ret) + goto out; + } dir->i_size += BOGO_DIRENT_SIZE; inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); -- 2.19.1