History

Merge tag '9p-6.3-fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull 9p fixes from Eric Van Hensbergen: "These are some collected fixes for the 6.3-rc series that have been passed our 9p regression tests and been in for-next for at least a week. They include a fix for a KASAN reported problem in the extended attribute handling code and a use after free in the xen transport. This also includes some updates for the MAINTAINERS file including the transition of our development mailing list from sourceforge.net to lists.linux.dev" * tag '9p-6.3-fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: Update email address and mailing list for v9fs 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition 9P FS: Fix wild-memory-access write in v9fs_get_acl

Linus Torvalds committed 3 years ago

Commit c118b592 parents 411eb01 347dca93 files · +12 −6Browse files

Unified · Split

3 files
  1. MAINTAINERS +3 −3
  2. fs/9p/xattr.c +5 −3
  3. net/9p/trans_xen.c +4 −0
MAINTAINERS+3−3
@@ -224,13 +224,13 @@ S: Orphan / Obsolete · 223 unmodified lines
224F: drivers/net/ethernet/8390/224F: drivers/net/ethernet/8390/
225 225
2269P FILE SYSTEM2269P FILE SYSTEM
227M: Eric Van Hensbergen <ericvh@gmail.com>227M: Eric Van Hensbergen <ericvh@kernel.org>
228M: Latchesar Ionkov <lucho@ionkov.net>228M: Latchesar Ionkov <lucho@ionkov.net>
229M: Dominique Martinet <asmadeus@codewreck.org>229M: Dominique Martinet <asmadeus@codewreck.org>
230R: Christian Schoenebeck <linux_oss@crudebyte.com>230R: Christian Schoenebeck <linux_oss@crudebyte.com>
231L: v9fs-developer@lists.sourceforge.net231L: v9fs@lists.linux.dev
232S: Maintained232S: Maintained
233W: http://swik.net/v9fs233W: http://github.com/v9fs
234Q: http://patchwork.kernel.org/project/v9fs-devel/list/234Q: http://patchwork.kernel.org/project/v9fs-devel/list/
235T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git235T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
236T: git git://github.com/martinetd/linux.git236T: git git://github.com/martinetd/linux.git
fs/9p/xattr.c+5−3
@@ -35,10 +35,12 @@ ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name, · 34 unmodified lines
35 return retval;35 return retval;
36 }36 }
37 if (attr_size > buffer_size) {37 if (attr_size > buffer_size) {
38 if (!buffer_size) /* request to get the attr_size */38 if (buffer_size)
39 retval = attr_size;
40 else
41 retval = -ERANGE;39 retval = -ERANGE;
40 else if (attr_size > SSIZE_MAX)
41 retval = -EOVERFLOW;
42 else /* request to get the attr_size */
43 retval = attr_size;
42 } else {44 } else {
43 iov_iter_truncate(&to, attr_size);45 iov_iter_truncate(&to, attr_size);
44 retval = p9_client_read(attr_fid, 0, &to, &err);46 retval = p9_client_read(attr_fid, 0, &to, &err);
net/9p/trans_xen.c+4−0
@@ -280,6 +280,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) · 279 unmodified lines
280 write_unlock(&xen_9pfs_lock);280 write_unlock(&xen_9pfs_lock);
281 281
282 for (i = 0; i < priv->num_rings; i++) {282 for (i = 0; i < priv->num_rings; i++) {
283 struct xen_9pfs_dataring *ring = &priv->rings[i];
284
285 cancel_work_sync(&ring->work);
286
283 if (!priv->rings[i].intf)287 if (!priv->rings[i].intf)
284 break;288 break;
285 if (priv->rings[i].irq > 0)289 if (priv->rings[i].irq > 0)