Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d775f15 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Greg Kroah-Hartman
Browse files

ovl: expand warning in ovl_d_real() 



commit cef4cbff06fbc3be54d6d79ee139edecc2ee8598 upstream.

There was a syzbot report with this warning but insufficient information...

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e86f8f88

fs/overlayfs/super.c

+8 −5
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void ovl_dentry_release(struct dentry *dentry) 
static struct dentry *ovl_d_real(struct dentry *dentry,

				 const struct inode *inode)

{

	struct dentry *real;

	struct dentry *real = NULL, *lower;



	/* It's an overlay file */

	if (inode && d_inode(dentry) == inode)
@@ -101,9 +101,10 @@ static struct dentry *ovl_d_real(struct dentry *dentry, 
	if (real && !inode && ovl_has_upperdata(d_inode(dentry)))

		return real;



	real = ovl_dentry_lowerdata(dentry);

	if (!real)

	lower = ovl_dentry_lowerdata(dentry);

	if (!lower)

		goto bug;

	real = lower;



	/* Handle recursion */

	real = d_real(real, inode);
@@ -111,8 +112,10 @@ static struct dentry *ovl_d_real(struct dentry *dentry, 
	if (!inode || inode == d_inode(real))

		return real;

bug:

	WARN(1, "ovl_d_real(%pd4, %s:%lu): real dentry not found\n", dentry,

	     inode ? inode->i_sb->s_id : "NULL", inode ? inode->i_ino : 0);

	WARN(1, "%s(%pd4, %s:%lu): real dentry (%p/%lu) not found\n",

	     __func__, dentry, inode ? inode->i_sb->s_id : "NULL",

	     inode ? inode->i_ino : 0, real,

	     real && d_inode(real) ? d_inode(real)->i_ino : 0);

	return dentry;

}