Commit 102b0d11 authored Mar 09, 2018 by Vivek Goyal Committed by Miklos Szeredi Apr 12, 2018

ovl: set d->is_dir and d->opaque for last path element



Certain properties in ovl_lookup_data should be set only for the last
element of the path. IOW, if we are calling ovl_lookup_single() for an
absolute redirect, then d->is_dir and d->opaque do not make much sense
for intermediate path elements. Instead set them only if dentry being
lookup is last path element.

As of now we do not seem to be making use of d->opaque if it is set for
a path/dentry in lower. But just define the semantics so that future code
can make use of this assumption.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

parent e9b77f90

fs/overlayfs/namei.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ static int ovl_lookup_single(struct dentry base, struct ovl_lookup_data d,
		{
		struct dentry *this;
		int err;
		bool last_element = !post[0];

		this = lookup_one_len_unlocked(name, base, namelen);
		if (IS_ERR(this)) {
		@@ -257,12 +258,15 @@ static int ovl_lookup_single(struct dentry base, struct ovl_lookup_data d,
		goto put_and_out;
		goto out;
		}
		if (last_element)
		d->is_dir = true;
		if (d->last)
		goto out;

		if (ovl_is_opaquedir(this)) {
		d->stop = d->opaque = true;
		d->stop = true;
		if (last_element)
		d->opaque = true;
		goto out;
		}
		err = ovl_check_redirect(this, d, prelen, post);

Admin message