Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reiserfs: propagate errors from fill_with_dentries() properly

Browse Source 
fill_with_dentries() failed to propagate errors up to
reiserfs_for_each_xattr() properly.  Plumb them through.

Note that reiserfs_for_each_xattr() is only used by
reiserfs_delete_xattrs() and reiserfs_chown_xattrs().  The result of
reiserfs_delete_xattrs() is discarded anyway, the only difference there is
whether a warning is printed to dmesg.  The result of
reiserfs_chown_xattrs() does matter because it can block chowning of the
file to which the xattrs belong; but either way, the resulting state can
have misaligned ownership, so my patch doesn't improve things greatly.

Credit for making me look at this code goes to Al Viro, who pointed out
that the ->actor calling convention is suboptimal and should be changed.

Link: http://lkml.kernel.org/r/20180802163335.83312-1-jannh@google.com
Signed-off-by: Jann Horn <jannh@google.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Jeff Mahoney <jeffm@suse.com>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jann Horn 2018-10-30 15:06:38 -07:00 committed by Linus Torvalds
parent 6c9a3f843a
commit b10298d56c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/reiserfs/xattr.c
View File

@ -185,6 +185,7 @@ struct reiserfs_dentry_buf {
struct dir_context ctx; struct dir_context ctx;
struct dentry *xadir; struct dentry *xadir;
int count; int count;
int err;
struct dentry *dentries[8]; struct dentry *dentries[8];
}; };
@ -207,6 +208,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,
dentry = lookup_one_len(name, dbuf->xadir, namelen); dentry = lookup_one_len(name, dbuf->xadir, namelen);
if (IS_ERR(dentry)) { if (IS_ERR(dentry)) {
dbuf->err = PTR_ERR(dentry);
return PTR_ERR(dentry); return PTR_ERR(dentry);
} else if (d_really_is_negative(dentry)) { } else if (d_really_is_negative(dentry)) {
/* A directory entry exists, but no file? */ /* A directory entry exists, but no file? */
@ -215,6 +217,7 @@ fill_with_dentries(struct dir_context *ctx, const char *name, int namelen,
"not found for file %pd.\n", "not found for file %pd.\n",
dentry, dbuf->xadir); dentry, dbuf->xadir);
dput(dentry); dput(dentry);
dbuf->err = -EIO;
return -EIO; return -EIO;
} }
@ -262,6 +265,10 @@ static int reiserfs_for_each_xattr(struct inode *inode,
err = reiserfs_readdir_inode(d_inode(dir), &buf.ctx); err = reiserfs_readdir_inode(d_inode(dir), &buf.ctx);
if (err) if (err)
break; break;
if (buf.err) {
err = buf.err;
break;
}
if (!buf.count) if (!buf.count)
break; break;
for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) { for (i = 0; !err && i < buf.count && buf.dentries[i]; i++) {