Skip to content

Commit e2aef86

Browse files
committed
Merge tag 'ovl-fixes-6.15-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs
Bring in overlayfs fixes for the current cycle. * tag 'ovl-fixes-6.15-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs: ovl: remove unused forward declaration ovl: don't allow datadir only Link: https://lore.kernel.org/CAJfpegt-EE4RROKDXA3g5GxAYXQrWcLAL1TfTPK-%3DVmPC7U13g@mail.gmail.com Signed-off-by: Christian Brauner <brauner@kernel.org>
2 parents 47a742f + a6eb9a4 commit e2aef86

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

fs/overlayfs/overlayfs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,6 @@ int ovl_set_metacopy_xattr(struct ovl_fs *ofs, struct dentry *d,
541541
bool ovl_is_metacopy_dentry(struct dentry *dentry);
542542
char *ovl_get_redirect_xattr(struct ovl_fs *ofs, const struct path *path, int padding);
543543
int ovl_ensure_verity_loaded(struct path *path);
544-
int ovl_get_verity_xattr(struct ovl_fs *ofs, const struct path *path,
545-
u8 *digest_buf, int *buf_length);
546544
int ovl_validate_verity(struct ovl_fs *ofs,
547545
struct path *metapath,
548546
struct path *datapath);

fs/overlayfs/super.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,11 @@ static struct ovl_entry *ovl_get_lowerstack(struct super_block *sb,
11381138
return ERR_PTR(-EINVAL);
11391139
}
11401140

1141+
if (ctx->nr == ctx->nr_data) {
1142+
pr_err("at least one non-data lowerdir is required\n");
1143+
return ERR_PTR(-EINVAL);
1144+
}
1145+
11411146
err = -EINVAL;
11421147
for (i = 0; i < ctx->nr; i++) {
11431148
l = &ctx->lower[i];

0 commit comments

Comments
 (0)