Message ID | d05f826c-5b68-2409-ac96-01f0885d0617@huawei.com |
---|---|
State | Not Applicable |
Headers | show |
Series | [4.4-stable] jffs2: return -ERANGE when xattr buffer is too small | expand |
On Fri, Oct 05, 2018 at 03:13:20PM +0800, Hou Tao wrote: > Hi Greg, > > The problem had been fixed by 764a5c6b1fa4 ("xattr handlers: Simplify list > operation") in v4.5-rc1, but the modification in that commit may be too much > because it modifies all file-systems which implement xattr, so I create a single > patch for jffs2 to fix the problem. Which one is your preference ? This single patch is good. But the tabs are all converted to spaces and this does not apply :( Please fix up and resend. thanks, greg k-h
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index 4c2c03663533..8e1427762eeb 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c @@ -1004,12 +1004,14 @@ ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size) rc = xhandle->list(xhandle, dentry, buffer + len, size - len, xd->xname, xd->name_len); + if (rc > size - len) { + rc = -ERANGE; + goto out; + } } else { rc = xhandle->list(xhandle, dentry, NULL, 0, xd->xname, xd->name_len); } - if (rc < 0) - goto out; len += rc; } rc = len;