Message ID | 20200420121511.017999512@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <SRS0=w1qd=6E=vger.kernel.org=stable-owner@kernel.org> 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 6EC59C3A5A0 for <stable@archiver.kernel.org>; Mon, 20 Apr 2020 13:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E6EF206DD for <stable@archiver.kernel.org>; Mon, 20 Apr 2020 13:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387615; bh=5Xy1zSPQ+mdSo3B1aRXGosoRE7Xufwwvy2PkysIsSp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=m43fFsnVkihgZE4dPis6L5GIPRSZcmIJcNpF7Vk6+Vz6/LtwBtlXsiJ+lQHAICDW9 97VuLGdJAmEAukYFDfUdHFFQ9Y/Z8x3w98urVpARpNIWJ4IznhYcRts36fNV5TpknV gLSEqPKfdisS3XQlLhl1d/AacT+iLa5qFyaUA3xI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727803AbgDTMkj (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 20 Apr 2020 08:40:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:32858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727109AbgDTMkf (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 20 Apr 2020 08:40:35 -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 6646420724; Mon, 20 Apr 2020 12:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386434; bh=5Xy1zSPQ+mdSo3B1aRXGosoRE7Xufwwvy2PkysIsSp8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cZQ1o59XnA/92i/xpWE//HN/xBOgWLmtxdx1WEUEsPjVFMPOSebugLPEuy7q9IFZb Bk9r9oQvRbYEmyvCdwDTaFYv9M+m1PVKCWz5zbPtFWc6D9sBZZ0YIAvmod6WR3Jj/A LIxAW8VUIpgVLtlyyXFwBRPM/ClZNBj7lEe2hjrc= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Amir Goldstein <amir73il@gmail.com>, Miklos Szeredi <mszeredi@redhat.com> Subject: [PATCH 5.5 21/65] ovl: fix value of i_ino for lower hardlink corner case Date: Mon, 20 Apr 2020 14:38:25 +0200 Message-Id: <20200420121511.017999512@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -881,7 +881,7 @@ struct inode *ovl_get_inode(struct super struct dentry *lowerdentry = lowerpath ? lowerpath->dentry : NULL; bool bylower = ovl_hash_bylower(sb, upperdentry, lowerdentry, oip->index); - int fsid = bylower ? oip->lowerpath->layer->fsid : 0; + int fsid = bylower ? lowerpath->layer->fsid : 0; bool is_dir, metacopy = false; unsigned long ino = 0; int err = oip->newinode ? -EEXIST : -ENOMEM; @@ -931,6 +931,8 @@ struct inode *ovl_get_inode(struct super err = -ENOMEM; goto out_err; } + ino = realinode->i_ino; + fsid = lowerpath->layer->fsid; } ovl_fill_inode(inode, realinode->i_mode, realinode->i_rdev, ino, fsid); ovl_inode_init(inode, upperdentry, lowerdentry, oip->lowerdata);