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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 C67B1C352A5 for ; Mon, 10 Feb 2020 13:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9573020714 for ; Mon, 10 Feb 2020 13:31:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581341489; bh=3LW15+MsNMrKCP6LKZVPHeODID8NRIDG+z5JP9dxDqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xvV7TB9ALZCQuO+tw+psPzRPuHGqg27S6UfCIbnOymraLsCZBQ/J7tKN7H73oaB6S iVIdMfwqsQAAk/WnOqcUNh8yVRG44rJ1mr/ocKFpfpER4liRJtYrsWb8r1XOLn+NGn pCPyzK2FSmxdwhvDh3YIMWFDaS8W8QP4Ad6UeQS0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728202AbgBJMgA (ORCPT ); Mon, 10 Feb 2020 07:36:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:52932 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727996AbgBJMfe (ORCPT ); Mon, 10 Feb 2020 07:35:34 -0500 Received: from localhost (unknown [209.37.97.194]) (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 6BA23214DB; Mon, 10 Feb 2020 12:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338134; bh=3LW15+MsNMrKCP6LKZVPHeODID8NRIDG+z5JP9dxDqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmnUpCPWLOmAh/UQ5V6gfYD6YAilCBmhZa5DAk8uBam80ztf2DF6OZ/LusYNwDVcQ oNr+t0QaAEKIDKOg5HKYJZV3E0uz4dTIPt7N/BfuFiE+RJCLs44Lk10Ca7uVc6EbPo CIMSp9GIQZ0kWdgnMVYexjQrrxnfHR22D21Y5bnw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Amir Goldstein , Miklos Szeredi Subject: [PATCH 4.19 080/195] ovl: fix wrong WARN_ON() in ovl_cache_update_ino() Date: Mon, 10 Feb 2020 04:32:18 -0800 Message-Id: <20200210122313.365334458@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122305.731206734@linuxfoundation.org> References: <20200210122305.731206734@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Amir Goldstein commit 4c37e71b713ecffe81f8e6273c6835e54306d412 upstream. The WARN_ON() that child entry is always on overlay st_dev became wrong when we allowed this function to update d_ino in non-samefs setup with xino enabled. It is not true in case of xino bits overflow on a non-dir inode. Leave the WARN_ON() only for directories, where assertion is still true. Fixes: adbf4f7ea834 ("ovl: consistent d_ino for non-samefs with xino") Cc: # v4.17+ Signed-off-by: Amir Goldstein Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/overlayfs/readdir.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/fs/overlayfs/readdir.c +++ b/fs/overlayfs/readdir.c @@ -507,7 +507,13 @@ get: if (err) goto fail; - WARN_ON_ONCE(dir->d_sb->s_dev != stat.dev); + /* + * Directory inode is always on overlay st_dev. + * Non-dir with ovl_same_dev() could be on pseudo st_dev in case + * of xino bits overflow. + */ + WARN_ON_ONCE(S_ISDIR(stat.mode) && + dir->d_sb->s_dev != stat.dev); ino = stat.ino; } else if (xinobits && !OVL_TYPE_UPPER(type)) { ino = ovl_remap_lower_ino(ino, xinobits,