From patchwork Sat May 20 12:05:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 96767 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp323208vqo; Sat, 20 May 2023 05:13:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7c3+3U8xX6ogJFqLydErE/ulKEGI6i5rOoo36fmcPSHCWzGVtFR3M0v+xolyOUzbZIeLK/ X-Received: by 2002:a17:90b:1e4d:b0:253:6c97:6861 with SMTP id pi13-20020a17090b1e4d00b002536c976861mr5238851pjb.17.1684584781209; Sat, 20 May 2023 05:13:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684584781; cv=none; d=google.com; s=arc-20160816; b=JEcc/nORHkxecXPq+cVvVcVH9Lq6Wj5+gO8qCRWJj+0Iy6M98+ZgN2TdKlIQ9Mk6+s /X1WOy3G+uAc1H2qiPbH4609+QUmJmU3YLKctX7RPvjJeMqVr8nZUpv2ETxnpk26EiGZ GN2xOrU6JBv5wOaCTiQQ+mKA8xwiWhEeZff5KE/UDW/lMs7/9Tgill5sCYpscFaw99Ps bmlxrQdgTGrdv3Apq3ObhGaks+uDtXNYEL+zwQzpxYERWvBeyDG9hwwqhF/T9QhljSAQ W1jSeqgYkJ15uynsWFpOFXTGK4LYAZFtdWEEJ9X64zCgUMpRHiFgGVHzQDv1JVc0U59Z DMeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=60TFqnza5VbHJKprZSin9i4HWkFAHRNaJt0eS4ZxD8s=; b=POLoj97rVvbrqxQR7PGDoPp+uUCr+5AZlQWZogRokX9kA0ffpp+TZLwjL6ps17TfSL HIGjmDdfalogUYloA5Q7Yh0fEO7tBKv7EjowfVm/yMUKSUhtI99TrioaZkJctVKXRUQU GkjGMCtKPoQ7D3R9JhEMmNvI5dGjEF/gY+LbX118P40f1rh8Z9BnsjMiF9oVDCAlI6rk +KtLi2hliH4Plp1ekUyL3EQMeWBNgtHd8sszjs3eOPpS2at8jUq0hXZesiqrH5gF4NUP ESAhC1ZYqOyB/GouWcjNfdLgpbE5HOpIJH7DEUqvQ7dnL2VhmKRxuQ0EdPJOx/43aaRo wj0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=PMDPDW82; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 22-20020a17090a0c1600b00246a5991cc6si1338815pjs.162.2023.05.20.05.12.47; Sat, 20 May 2023 05:13:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=PMDPDW82; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231481AbjETMFi (ORCPT + 99 others); Sat, 20 May 2023 08:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbjETMFg (ORCPT ); Sat, 20 May 2023 08:05:36 -0400 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2540ED9 for ; Sat, 20 May 2023 05:05:33 -0700 (PDT) Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A05273F4A6 for ; Sat, 20 May 2023 12:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684584331; bh=60TFqnza5VbHJKprZSin9i4HWkFAHRNaJt0eS4ZxD8s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=PMDPDW82uuAJYA7b3JgyqIH8bJukZlBSO8Ov1qh7AY5HxGsNnXuk+AH/McWB2l+B0 Q0OajxeZeWok+Kjt+PEcK4mfIusmVZV6uLTngrSRJMfriVRoYap52QbaOTqBOGmYXH n1JsxhyhAabjouLkCGNUMjKIgWS2h34EpPT8s2qPCxdg5PNfbcUowM8sNrr5Rj7OzM Lmbhm4o7WIHNG+tPE63Jl4WzTaEFUpclP6Qu2OiIFfS6PmBDQy2SANc6gJ6jYxYFk6 /RSMZ+wKYNwLOBvNrbN8aLnNGfsy9jSmwcNFkkoqopQcD3x0zQTQ4XH1TIDLdu7G8T oXZMwearJWN0g== Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-94a348facbbso564845966b.1 for ; Sat, 20 May 2023 05:05:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684584330; x=1687176330; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=60TFqnza5VbHJKprZSin9i4HWkFAHRNaJt0eS4ZxD8s=; b=O+zgYqRrTO/km9BHrAkvrXyTFkq0kuJn2l8YdephMr09VVf3u1i00GjMcCQroFeu9q b0Aey4hqLNYvHHex1u/trcrqUPvPkK+eViWqk24rgsd2OxQLsdDOPKmXzr/E/s+gB495 RAE1SfxGZP22Ab0rulHSe2UqNH83qxBTIdN+oY2TY3zQbgDgLM+6neq9dlPla8SBitTc BZeNYSjomwcc/i3XYb5l1uAPGmE9auJFvX3R+iPM3dULTdGbOQc9wTT0a/JExWcQqrYD kbFQY2scBfyg5jpSVtZt3gUzYt5Vrh2esZEThZK/405vlkiE3KCuNN3Y+vGIyRLyAE8W HD+A== X-Gm-Message-State: AC+VfDynjv5QAaRB2XRKGIxDg5WPjjHTikhMqLEGjPLslCgPtPjzXfaa tsF8q6TtqMDzfOPjdvTeZb42sUbA9ng0/PbG227eAf+RVvL6ZRKt8XPyL2kSO9kJLqm8ms3E/QV hpXQYH3ZzEGVCsZ0f2bv2WA3R/Ddl6I9vecLDQb2zMA== X-Received: by 2002:a17:906:58d4:b0:961:8fcd:53bc with SMTP id e20-20020a17090658d400b009618fcd53bcmr5391972ejs.21.1684584330194; Sat, 20 May 2023 05:05:30 -0700 (PDT) X-Received: by 2002:a17:906:58d4:b0:961:8fcd:53bc with SMTP id e20-20020a17090658d400b009618fcd53bcmr5391947ejs.21.1684584329789; Sat, 20 May 2023 05:05:29 -0700 (PDT) Received: from righiandr-XPS-13-7390.homenet.telecomitalia.it (host-87-10-127-160.retail.telecomitalia.it. [87.10.127.160]) by smtp.gmail.com with ESMTPSA id gv18-20020a170906f11200b00965a4350411sm731443ejb.9.2023.05.20.05.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 May 2023 05:05:29 -0700 (PDT) From: Andrea Righi To: Miklos Szeredi Cc: linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ovl: make consistent use of OVL_FS() Date: Sat, 20 May 2023 14:05:28 +0200 Message-Id: <20230520120528.339680-1-andrea.righi@canonical.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766415171326228035?= X-GMAIL-MSGID: =?utf-8?q?1766415171326228035?= Always use OVL_FS() to retrieve the corresponding struct ovl_fs from a struct super_block and make sure that it is exclusively used with an overlayfs superblock (otherwise, trigger a BUG). Signed-off-by: Andrea Righi --- fs/overlayfs/copy_up.c | 2 +- fs/overlayfs/export.c | 10 +++++----- fs/overlayfs/inode.c | 8 ++++---- fs/overlayfs/namei.c | 2 +- fs/overlayfs/ovl_entry.h | 4 ++++ fs/overlayfs/super.c | 10 +++++----- fs/overlayfs/util.c | 18 +++++++++--------- 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index f658cc8ea492..60aa615820e7 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.c @@ -905,7 +905,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c) static bool ovl_need_meta_copy_up(struct dentry *dentry, umode_t mode, int flags) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); if (!ofs->config.metacopy) return false; diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c index defd4e231ad2..f5f0ef8e3ce8 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c @@ -182,7 +182,7 @@ static int ovl_connect_layer(struct dentry *dentry) */ static int ovl_check_encode_origin(struct dentry *dentry) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); /* Upper file handle for pure upper */ if (!ovl_dentry_lower(dentry)) @@ -434,7 +434,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb, struct dentry *real, const struct ovl_layer *layer) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); struct dentry *index = NULL; struct dentry *this = NULL; struct inode *inode; @@ -655,7 +655,7 @@ static struct dentry *ovl_get_dentry(struct super_block *sb, struct ovl_path *lowerpath, struct dentry *index) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); const struct ovl_layer *layer = upper ? &ofs->layers[0] : lowerpath->layer; struct dentry *real = upper ?: (index ?: lowerpath->dentry); @@ -680,7 +680,7 @@ static struct dentry *ovl_get_dentry(struct super_block *sb, static struct dentry *ovl_upper_fh_to_d(struct super_block *sb, struct ovl_fh *fh) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); struct dentry *dentry; struct dentry *upper; @@ -700,7 +700,7 @@ static struct dentry *ovl_upper_fh_to_d(struct super_block *sb, static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, struct ovl_fh *fh) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); struct ovl_path origin = { }; struct ovl_path *stack = &origin; struct dentry *dentry = NULL; diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index 541cf3717fc2..c27823f6e7aa 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -334,7 +334,7 @@ static const char *ovl_get_link(struct dentry *dentry, bool ovl_is_private_xattr(struct super_block *sb, const char *name) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); if (ofs->config.userxattr) return strncmp(name, OVL_XATTR_USER_PREFIX, @@ -689,7 +689,7 @@ int ovl_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags) { if (flags & S_ATIME) { - struct ovl_fs *ofs = inode->i_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(inode->i_sb); struct path upperpath = { .mnt = ovl_upper_mnt(ofs), .dentry = ovl_upperdentry_dereference(OVL_I(inode)), @@ -952,7 +952,7 @@ static inline void ovl_lockdep_annotate_inode_mutex_key(struct inode *inode) static void ovl_next_ino(struct inode *inode) { - struct ovl_fs *ofs = inode->i_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(inode->i_sb); inode->i_ino = atomic_long_inc_return(&ofs->last_ino); if (unlikely(!inode->i_ino)) @@ -1284,7 +1284,7 @@ struct inode *ovl_get_trap_inode(struct super_block *sb, struct dentry *dir) static bool ovl_hash_bylower(struct super_block *sb, struct dentry *upper, struct dentry *lower, bool index) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); /* No, if pure upper */ if (!lower) diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c index cfb3420b7df0..d0f196b85541 100644 --- a/fs/overlayfs/namei.c +++ b/fs/overlayfs/namei.c @@ -832,7 +832,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, { struct ovl_entry *oe; const struct cred *old_cred; - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); struct ovl_entry *poe = dentry->d_parent->d_fsdata; struct ovl_entry *roe = dentry->d_sb->s_root->d_fsdata; struct ovl_path *stack = NULL, *origin_path = NULL; diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h index fd11fe6d6d45..b91b3694ae26 100644 --- a/fs/overlayfs/ovl_entry.h +++ b/fs/overlayfs/ovl_entry.h @@ -5,6 +5,8 @@ * Copyright (C) 2016 Red Hat, Inc. */ +#include + struct ovl_config { char *lowerdir; char *upperdir; @@ -97,6 +99,8 @@ static inline struct mnt_idmap *ovl_upper_mnt_idmap(struct ovl_fs *ofs) static inline struct ovl_fs *OVL_FS(struct super_block *sb) { + /* Make sure OVL_FS() is always used with an overlayfs superblock */ + BUG_ON(sb->s_magic != OVERLAYFS_SUPER_MAGIC); return (struct ovl_fs *)sb->s_fs_info; } diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index f97ad8b40dbb..879d601ba61e 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -259,7 +259,7 @@ static void ovl_free_fs(struct ovl_fs *ofs) static void ovl_put_super(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); ovl_free_fs(ofs); } @@ -267,7 +267,7 @@ static void ovl_put_super(struct super_block *sb) /* Sync real dirty inodes in upper filesystem (if it exists) */ static int ovl_sync_fs(struct super_block *sb, int wait) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); struct super_block *upper_sb; int ret; @@ -315,7 +315,7 @@ static int ovl_sync_fs(struct super_block *sb, int wait) */ static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); struct dentry *root_dentry = dentry->d_sb->s_root; struct path path; int err; @@ -364,7 +364,7 @@ static inline int ovl_xino_def(void) static int ovl_show_options(struct seq_file *m, struct dentry *dentry) { struct super_block *sb = dentry->d_sb; - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); seq_show_option(m, "lowerdir", ofs->config.lowerdir); if (ofs->config.upperdir) { @@ -396,7 +396,7 @@ static int ovl_show_options(struct seq_file *m, struct dentry *dentry) static int ovl_remount(struct super_block *sb, int *flags, char *data) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); struct super_block *upper_sb; int ret = 0; diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c index 923d66d131c1..2425240ef139 100644 --- a/fs/overlayfs/util.c +++ b/fs/overlayfs/util.c @@ -18,25 +18,25 @@ int ovl_want_write(struct dentry *dentry) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); return mnt_want_write(ovl_upper_mnt(ofs)); } void ovl_drop_write(struct dentry *dentry) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); mnt_drop_write(ovl_upper_mnt(ofs)); } struct dentry *ovl_workdir(struct dentry *dentry) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); return ofs->workdir; } const struct cred *ovl_override_creds(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); return override_creds(ofs->creator_cred); } @@ -62,7 +62,7 @@ int ovl_can_decode_fh(struct super_block *sb) struct dentry *ovl_indexdir(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); return ofs->indexdir; } @@ -70,7 +70,7 @@ struct dentry *ovl_indexdir(struct super_block *sb) /* Index all files on copy up. For now only enabled for NFS export */ bool ovl_index_all(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); return ofs->config.nfs_export && ofs->config.index; } @@ -78,7 +78,7 @@ bool ovl_index_all(struct super_block *sb) /* Verify lower origin on lookup. For now only enabled for NFS export */ bool ovl_verify_lower(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); return ofs->config.nfs_export && ofs->config.index; } @@ -152,7 +152,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry) void ovl_path_upper(struct dentry *dentry, struct path *path) { - struct ovl_fs *ofs = dentry->d_sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(dentry->d_sb); path->mnt = ovl_upper_mnt(ofs); path->dentry = ovl_dentry_upper(dentry); @@ -415,7 +415,7 @@ bool ovl_dentry_needs_data_copy_up(struct dentry *dentry, int flags) bool ovl_redirect_dir(struct super_block *sb) { - struct ovl_fs *ofs = sb->s_fs_info; + struct ovl_fs *ofs = OVL_FS(sb); return ofs->config.redirect_dir && !ofs->noxattr; }