ovl: follow lower to lowerdata redirects from any lower layer

Commit 5ef7bcdeec ("ovl: relax redirect/metacopy requirements for lower
-> data redirect") allowed following redirects from a lower layer to a
data-only layer without redirect_dir=follow and metacopy=on, so that
data-only layers can be used with userxattr.

That fix was incomplete.  Without metacopy=on, a metacopy file with an
absolute redirect into a data-only layer is followed only from the lowest
lower layer.  From any other lower layer, the lookup fails with EPERM.

That commit also changed the behavior of redirect_dir=nofollow without
making it visible to users.  With data-only layers, some redirects are
followed, although the mount options show redirect_dir=nofollow, or
show nothing when that is the default.

Add redirect_dir=followdata, which follows only redirects from lower to
lowerdata, and select it when there are data-only layers, unless
redirect_dir=follow or redirect_dir=on is in effect, so the redirect
follow mode in effect is shown in /proc/self/mountinfo.

Without metacopy=on, the absolute redirect of a lower metacopy file stops
the lookup in the lower layers and the data is looked up in the data-only
layers.  Data-only layers cannot be used without following redirects,
so reject an explicit redirect_dir=nofollow with data-only layers.

Fixes: 5ef7bcdeec ("ovl: relax redirect/metacopy requirements for lower -> data redirect")
Cc: [email protected]
Signed-off-by: Giuseppe Scrivano <[email protected]>
Signed-off-by: Amir Goldstein <[email protected]>
This commit is contained in:
Giuseppe Scrivano
2026-11-10 15:47:33 +01:00
committed by Amir Goldstein
parent 248503755b
commit cbf4ccabcb
6 changed files with 97 additions and 30 deletions
+15 -9
View File
@@ -236,14 +236,19 @@ Module options (can also be changed through /sys/module/overlay/parameters/):
Mount options:
- "redirect_dir=on":
Redirects are enabled.
Redirects are created and followed.
- "redirect_dir=follow":
Redirects are not created, but followed.
- "redirect_dir=followdata":
Redirects are not created.
Only redirects from lower to lowerdata are followed.
- "redirect_dir=nofollow":
Redirects are not created and not followed.
- "redirect_dir=off":
If "redirect_always_follow" is enabled in the kernel/module config,
this "off" translates to "follow", otherwise it translates to "nofollow".
Redirects are not created.
Which redirects are followed depends on "redirect_always_follow" in the
kernel/module config, on data-only lower layers and on the "userxattr"
mount option.
When the NFS export feature is enabled, every copied up directory is
indexed by the file handle of the lower inode and a file handle of the
@@ -418,8 +423,8 @@ pointed by REDIRECT. This should not be possible on local system as setting
"trusted." xattrs will require CAP_SYS_ADMIN. But it should be possible
for untrusted layers like from a pen drive.
Note: redirect_dir={off|nofollow|follow[*]} and nfs_export=on mount options
conflict with metacopy=on, and will result in an error.
Note: redirect_dir={off|nofollow|followdata|follow[*]} and nfs_export=on
mount options conflict with metacopy=on, and will result in an error.
[*] redirect_dir=follow only conflicts with metacopy=on if upperdir=... is
given.
@@ -460,10 +465,11 @@ to the absolute path of the "lower data" file in the "data-only" lower layer.
Instead of explicitly enabling "metacopy=on" it is sufficient to specify at
least one data-only layer to enable redirection of data to a data-only layer.
In this case other forms of metacopy are rejected. Note: this way, data-only
layers may be used together with "userxattr", in which case careful attention
must be given to privileges needed to change the "user.overlay.redirect" xattr
to prevent misuse.
In this case other forms of metacopy are rejected. A data-only layer selects
"redirect_dir=followdata", unless "redirect_dir=follow" or "redirect_dir=on" is
in effect. Note: this way, data-only layers may be used together with
"userxattr", in which case careful attention must be given to privileges needed
to change the "user.overlay.redirect" xattr to prevent misuse.
Since kernel version v6.8, "data-only" lower layers can also be added using
the "datadir+" mount options and the fsconfig syscall from new mount api.
+21 -3
View File
@@ -1079,7 +1079,8 @@ static bool ovl_check_follow_redirect(struct ovl_lookup_data *d)
pr_warn_ratelimited("refusing to follow metacopy origin for (%pd2)\n", d->dentry);
return false;
}
if ((d->redirect || d->upperredirect) && !ovl_redirect_follow(ofs)) {
/* Check follow to lower layer, redirects to lowerdata are not checked here */
if ((d->redirect || d->upperredirect) && !ovl_redirect_follow_lower(ofs)) {
pr_warn_ratelimited("refusing to follow redirect for (%pd2)\n", d->dentry);
return false;
}
@@ -1097,13 +1098,26 @@ struct ovl_lookup_ctx {
unsigned int ctr;
};
/*
* Without metacopy=on, the absolute redirect of a lower metacopy file is
* followed only into the data-only layers.
*/
static bool ovl_is_lowerdata_redirect(struct ovl_lookup_ctx *ctx,
struct ovl_lookup_data *d)
{
struct ovl_fs *ofs = OVL_FS(d->sb);
return ofs->numdatalayer && !ofs->config.metacopy && ctx->ctr &&
d->metacopy && d->absolute_redirect;
}
static int ovl_lookup_layers(struct ovl_lookup_ctx *ctx, struct ovl_lookup_data *d)
{
struct dentry *dentry = ctx->dentry;
struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
struct ovl_entry *poe = OVL_E(dentry->d_parent);
struct ovl_entry *roe = OVL_E(dentry->d_sb->s_root);
bool check_redirect = (ovl_redirect_follow(ofs) || ofs->numdatalayer);
bool check_redirect = ovl_redirect_follow(ofs);
struct dentry *upperdir;
struct dentry *this;
struct dentry *origin = NULL;
@@ -1234,6 +1248,10 @@ static int ovl_lookup_layers(struct ovl_lookup_ctx *ctx, struct ovl_lookup_data
ctx->ctr++;
}
/* Lookup of lowerdata in the data-only layers only */
if (ovl_is_lowerdata_redirect(ctx, d))
d->stop = true;
if (d->stop)
break;
@@ -1404,7 +1422,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
{
struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
struct ovl_entry *poe = OVL_E(dentry->d_parent);
bool check_redirect = (ovl_redirect_follow(ofs) || ofs->numdatalayer);
bool check_redirect = ovl_redirect_follow(ofs);
int err;
struct ovl_lookup_ctx ctx = {
.dentry = dentry,
+13 -2
View File
@@ -77,11 +77,13 @@ enum ovl_entry_flag {
enum {
/*
* "off" mode is never used after mount options are verified. In effect
* it translates to either "follow" or "nofollow".
* "off" mode is never used after mount options are verified.
* In effect it translates to either "follow", "nofollow" or
* "followdata" (with data-only layers).
*/
OVL_REDIRECT_OFF,
OVL_REDIRECT_FOLLOW,
OVL_REDIRECT_FOLLOWDATA,
OVL_REDIRECT_NOFOLLOW,
OVL_REDIRECT_ON,
};
@@ -637,11 +639,20 @@ static inline char ovl_get_opaquedir_val(struct ovl_fs *ofs,
return ovl_get_dir_xattr_val(ofs, path, OVL_XATTR_OPAQUE);
}
/* Are redirects followed into lower layers? */
static inline bool ovl_redirect_follow_lower(struct ovl_fs *ofs)
{
return ofs->config.redirect_mode == OVL_REDIRECT_FOLLOW ||
ofs->config.redirect_mode == OVL_REDIRECT_ON;
}
/* Are redirects followed into lower or lowerdata layers? */
static inline bool ovl_redirect_follow(struct ovl_fs *ofs)
{
return ofs->config.redirect_mode != OVL_REDIRECT_NOFOLLOW;
}
/* Are redirects created in upper dir? */
static inline bool ovl_redirect_dir(struct ovl_fs *ofs)
{
return ofs->config.redirect_mode == OVL_REDIRECT_ON;
+36 -9
View File
@@ -107,6 +107,7 @@ static int ovl_xino_def(void)
const struct constant_table ovl_parameter_redirect_dir[] = {
{ "off", OVL_REDIRECT_OFF },
{ "follow", OVL_REDIRECT_FOLLOW },
{ "followdata", OVL_REDIRECT_FOLLOWDATA },
{ "nofollow", OVL_REDIRECT_NOFOLLOW },
{ "on", OVL_REDIRECT_ON },
{}
@@ -117,21 +118,29 @@ static const char *ovl_redirect_mode_name(int redirect_mode)
return ovl_parameter_redirect_dir[redirect_mode].name;
}
static const char *ovl_redirect_mode(struct ovl_config *config)
const char *ovl_redirect_mode(struct ovl_config *config)
{
return ovl_redirect_mode_name(config->redirect_mode);
}
static int ovl_redirect_follow_mode(void)
int ovl_redirect_follow_mode(bool follow_lower, size_t nr_data)
{
return ovl_redirect_always_follow ? OVL_REDIRECT_FOLLOW :
OVL_REDIRECT_NOFOLLOW;
if (ovl_redirect_always_follow && follow_lower)
return OVL_REDIRECT_FOLLOW;
/* Data-only layers cannot be used without following redirects to them */
return nr_data ? OVL_REDIRECT_FOLLOWDATA : OVL_REDIRECT_NOFOLLOW;
}
/*
* The default for show_options() is resolved as if there are no data-only layers,
* so that redirect_dir=followdata, which is auto selected with data-only layers,
* is displayed in mount options.
*/
static int ovl_redirect_mode_def(void)
{
return ovl_redirect_dir_def ? OVL_REDIRECT_ON :
ovl_redirect_follow_mode();
ovl_redirect_follow_mode(true, 0);
}
static const struct constant_table ovl_parameter_verity[] = {
@@ -890,6 +899,9 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
struct ovl_opt_set set = ctx->set;
/* The requested redirect_dir=, for reporting conflicts with it */
int redirect_opt = config->redirect_mode;
/* The redirect follow mode for redirect_dir=off and for the default */
int follow_mode = ovl_redirect_follow_mode(!config->userxattr,
ctx->nr_data);
/* Workdir/index are useless in non-upper mount */
if (!config->upperdir) {
@@ -916,9 +928,12 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
config->uuid = OVL_UUID_NULL;
}
/* Resolve redirect_dir=off to the default redirect follow mode */
/*
* Resolve redirect_dir=off to the default redirect follow mode.
* With userxattr, redirects are not followed to lower by default.
*/
if (config->redirect_mode == OVL_REDIRECT_OFF)
config->redirect_mode = ovl_redirect_follow_mode();
config->redirect_mode = follow_mode;
/*
* This is to make the logic below simpler. It doesn't make any other
@@ -1015,7 +1030,8 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
/* Resolve userxattr -> !redirect && !metacopy dependency */
if (config->userxattr) {
if (set.redirect &&
config->redirect_mode != OVL_REDIRECT_NOFOLLOW) {
config->redirect_mode != OVL_REDIRECT_NOFOLLOW &&
config->redirect_mode != OVL_REDIRECT_FOLLOWDATA) {
pr_err("conflicting options: userxattr,redirect_dir=%s\n",
ovl_redirect_mode_name(redirect_opt));
return -EINVAL;
@@ -1030,10 +1046,21 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
* options must be explicitly enabled if used together with
* userxattr.
*/
config->redirect_mode = OVL_REDIRECT_NOFOLLOW;
if (!set.redirect)
config->redirect_mode = follow_mode;
config->metacopy = false;
}
/* Data-only layers are reached through redirects */
if (ctx->nr_data && config->redirect_mode == OVL_REDIRECT_NOFOLLOW) {
pr_err("redirect_dir=nofollow is not supported with data-only layers\n");
return -EINVAL;
}
if (!ctx->nr_data && config->redirect_mode == OVL_REDIRECT_FOLLOWDATA) {
pr_err("redirect_dir=followdata requires data-only layers\n");
return -EINVAL;
}
/*
* Fail if we don't have trusted xattr capability and a feature was
* explicitly requested that requires them.
+2
View File
@@ -42,3 +42,5 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
struct ovl_config *config);
int ovl_show_options(struct seq_file *m, struct dentry *dentry);
const char *ovl_xino_mode(struct ovl_config *config);
const char *ovl_redirect_mode(struct ovl_config *config);
int ovl_redirect_follow_mode(bool follow_lower, size_t nr_data);
+10 -7
View File
@@ -701,7 +701,7 @@ static int ovl_create_volatile_dirty(struct ovl_fs *ofs)
}
static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
const struct path *workpath)
const struct path *workpath, size_t nr_data)
{
struct vfsmount *mnt = ovl_upper_mnt(ofs);
struct dentry *workdir;
@@ -765,9 +765,11 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
if (err) {
pr_warn("failed to set xattr on upper\n");
ofs->noxattr = true;
if (ovl_redirect_follow(ofs)) {
ofs->config.redirect_mode = OVL_REDIRECT_NOFOLLOW;
pr_warn("...falling back to redirect_dir=nofollow.\n");
if (ovl_redirect_follow_lower(ofs)) {
ofs->config.redirect_mode =
ovl_redirect_follow_mode(false, nr_data);
pr_warn("...falling back to redirect_dir=%s.\n",
ovl_redirect_mode(&ofs->config));
}
if (ofs->config.metacopy) {
ofs->config.metacopy = false;
@@ -844,7 +846,7 @@ out:
static int ovl_get_workdir(struct super_block *sb, struct ovl_fs *ofs,
const struct path *upperpath,
const struct path *workpath)
const struct path *workpath, size_t nr_data)
{
int err;
@@ -873,7 +875,7 @@ static int ovl_get_workdir(struct super_block *sb, struct ovl_fs *ofs,
if (err)
return err;
return ovl_make_workdir(sb, ofs, workpath);
return ovl_make_workdir(sb, ofs, workpath, nr_data);
}
static int ovl_get_indexdir(struct super_block *sb, struct ovl_fs *ofs,
@@ -1485,7 +1487,8 @@ static int ovl_fill_super_creds(struct fs_context *fc, struct super_block *sb)
}
}
err = ovl_get_workdir(sb, ofs, &ctx->upper, &ctx->work);
err = ovl_get_workdir(sb, ofs, &ctx->upper, &ctx->work,
ctx->nr_data);
if (err)
return err;