From patchwork Tue May 15 10:26:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10400809 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C9CA600F4 for ; Tue, 15 May 2018 10:25:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85E632872E for ; Tue, 15 May 2018 10:25:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AA3828734; Tue, 15 May 2018 10:25:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C3402872E for ; Tue, 15 May 2018 10:25:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752696AbeEOKZF (ORCPT ); Tue, 15 May 2018 06:25:05 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:38542 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752431AbeEOKZB (ORCPT ); Tue, 15 May 2018 06:25:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id m129-v6so54897wmb.3; Tue, 15 May 2018 03:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IXLQOzn7G+GGAPkY6Jo3059RMmsr5O3ASiwwpUtrJIE=; b=nB1MQPJzJOBqql8ZEZlTNKzw6Yk1GvOU0hE28iJP3LlRbbuPWt/w3jEET8Vs+63KMO LK2eCJdTEofSuYVpBKOgM9ddt4gFgla3ODuPU5OOPLGFhPpHbKCFwzP6mFwH8o8LVxOF hPfkx4Tw6ldnukc0H72BG/lBHJlNQATIZoQ+RZcSITS0Zn/bEyc90y0Xk3vlrh/FeJF2 hqOSBzOC9pO79uwGnH6pAXpwtqsnu6VBlR4sF+Crk1liZhpN1FARGfR5dHfLQFTilOhN 8240N9pvfw2974TxkUf/2h/C3uIhouOT9oJVEZXrMzWAMR5ynztZVAhCDa63Q53cyto+ 35Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IXLQOzn7G+GGAPkY6Jo3059RMmsr5O3ASiwwpUtrJIE=; b=VGXtwOWPrbYdKORGQz5m+tG0BVLxb5fVF3KeiyXIw0UbbrLQGMi6SFsopMTc4Bixce XfR4KbJEV4QqGra03S9jJfwMIYy7rQloASGupyz38FHfsFXGFXLpubAPo/887XxZa2Pb ALuykx9K6cT8nTq6gpWjeCpZF4813HxF1lF5D6lyWorSdtYJ2Idp8mZ2rEdKEW0GgJ8g JIIvAGOM/J6fiygIaDOQbHQHBCb3DC+6IWznzj09T3/SOJLQUMvc1W8Ql76moh47XemQ BpxmdOvyTqmGbp8dHiItqlTmhMKmcGLIoMU4K8Xo5VF7JFg6cw5C0VysxJ+ewnGnC/lM YLVQ== X-Gm-Message-State: ALKqPwfuYtF9E43447IYYzR4TLJTlfzVrVBAMTo1Wfh5n4GzOkGwTR80 XIpWZyhMBfdNMObQgy7cq83MPA== X-Google-Smtp-Source: AB8JxZplAaKC4+tNjYabOmPR6BRlWY0uP39A3KO/CkrZrl3yQ3Ne+cHGV+GIr16HBegWZjQmThyIMw== X-Received: by 2002:a50:866d:: with SMTP id 42-v6mr16710959edt.229.1526379899696; Tue, 15 May 2018 03:24:59 -0700 (PDT) Received: from amir-VirtualBox.ctera.local (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id v22-v6sm10039edq.15.2018.05.15.03.24.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 May 2018 03:24:59 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , Vivek Goyal , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 2/4] ovl: relax WARN_ON() real inode attributes mismatch Date: Tue, 15 May 2018 13:26:10 +0300 Message-Id: <1526379972-20923-3-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526379972-20923-1-git-send-email-amir73il@gmail.com> References: <1526379972-20923-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Overlayfs should cope with online changes to underlying layer without crashing the kernel, which is what xfstest overlay/019 checks. This test may sometimes trigger WARN_ON() in ovl_create_or_link() when linking an overlay inode that has been changed on underlying layer. Replace those WARN_ON() with pr_warn_ratelimited() to prevent test from failing and because this is more appropriate to the use case. Signed-off-by: Amir Goldstein --- fs/overlayfs/dir.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 62e6733b755c..25b339278684 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c @@ -525,9 +525,17 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, if (!err) { struct inode *realinode = d_inode(ovl_dentry_upper(dentry)); - WARN_ON(inode->i_mode != realinode->i_mode); - WARN_ON(!uid_eq(inode->i_uid, realinode->i_uid)); - WARN_ON(!gid_eq(inode->i_gid, realinode->i_gid)); + if (inode->i_mode != realinode->i_mode || + !uid_eq(inode->i_uid, realinode->i_uid) || + !gid_eq(inode->i_gid, realinode->i_gid)) { + pr_warn_ratelimited("overlayfs: real inode attributes mismatch (%pd2, %o.%u.%u != %o.%u.%u).\n", + dentry, inode->i_mode, + from_kuid(&init_user_ns, inode->i_uid), + from_kgid(&init_user_ns, inode->i_gid), + realinode->i_mode, + from_kuid(&init_user_ns, realinode->i_uid), + from_kgid(&init_user_ns, realinode->i_gid)); + } } return err; }