* [RESEND][PATCH 4.4-stable] jffs2: return -ERANGE when xattr buffer is too small
@ 2018-10-12 6:01 Hou Tao
2018-10-16 14:06 ` Patch "jffs2: return -ERANGE when xattr buffer is too small" has been added to the 4.4-stable tree gregkh
0 siblings, 1 reply; 2+ messages in thread
From: Hou Tao @ 2018-10-12 6:01 UTC (permalink / raw)
To: gregkh, stable; +Cc: linux-mtd, agruenba, dwmw2, houtao1
When a file have multiple xattrs and the passed buffer is
smaller than the required size, jffs2_listxattr() should
return -ERANGE instead of continue, else Oops may occur
due to memory corruption.
Also remove the unnecessary check ("rc < 0"), because
xhandle->list(...) will not return an error number.
Spotted by generic/377 in xfstests-dev.
NB: The problem had been fixed by commit 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.
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
fs/jffs2/xattr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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;
--
2.16.2.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Patch "jffs2: return -ERANGE when xattr buffer is too small" has been added to the 4.4-stable tree
2018-10-12 6:01 [RESEND][PATCH 4.4-stable] jffs2: return -ERANGE when xattr buffer is too small Hou Tao
@ 2018-10-16 14:06 ` gregkh
0 siblings, 0 replies; 2+ messages in thread
From: gregkh @ 2018-10-16 14:06 UTC (permalink / raw)
To: agruenba, dwmw2, gregkh, houtao1, linux-mtd; +Cc: stable-commits
This is a note to let you know that I've just added the patch titled
jffs2: return -ERANGE when xattr buffer is too small
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
jffs2-return-erange-when-xattr-buffer-is-too-small.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From houtao1@huawei.com Tue Oct 16 15:52:02 2018
From: Hou Tao <houtao1@huawei.com>
Date: Fri, 12 Oct 2018 14:01:26 +0800
Subject: jffs2: return -ERANGE when xattr buffer is too small
To: <gregkh@linuxfoundation.org>, <stable@vger.kernel.org>
Cc: <linux-mtd@lists.infradead.org>, <agruenba@redhat.com>, <dwmw2@infradead.org>, <houtao1@huawei.com>
Message-ID: <20181012060126.33739-1-houtao1@huawei.com>
From: Hou Tao <houtao1@huawei.com>
When a file have multiple xattrs and the passed buffer is
smaller than the required size, jffs2_listxattr() should
return -ERANGE instead of continue, else Oops may occur
due to memory corruption.
Also remove the unnecessary check ("rc < 0"), because
xhandle->list(...) will not return an error number.
Spotted by generic/377 in xfstests-dev.
NB: The problem had been fixed by commit 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.
Signed-off-by: Hou Tao <houtao1@huawei.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/jffs2/xattr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -1004,12 +1004,14 @@ ssize_t jffs2_listxattr(struct dentry *d
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;
Patches currently in stable-queue which might be from houtao1@huawei.com are
queue-4.4/jffs2-return-erange-when-xattr-buffer-is-too-small.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-16 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-12 6:01 [RESEND][PATCH 4.4-stable] jffs2: return -ERANGE when xattr buffer is too small Hou Tao
2018-10-16 14:06 ` Patch "jffs2: return -ERANGE when xattr buffer is too small" has been added to the 4.4-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.