Commit c118b59e authored by Linus Torvalds's avatar Linus Torvalds

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
parents 411eb014 347dca97
...@@ -224,13 +224,13 @@ S: Orphan / Obsolete ...@@ -224,13 +224,13 @@ S: Orphan / Obsolete
F: drivers/net/ethernet/8390/ F: drivers/net/ethernet/8390/
9P FILE SYSTEM 9P FILE SYSTEM
M: Eric Van Hensbergen <ericvh@gmail.com> M: Eric Van Hensbergen <ericvh@kernel.org>
M: Latchesar Ionkov <lucho@ionkov.net> M: Latchesar Ionkov <lucho@ionkov.net>
M: Dominique Martinet <asmadeus@codewreck.org> M: Dominique Martinet <asmadeus@codewreck.org>
R: Christian Schoenebeck <linux_oss@crudebyte.com> R: Christian Schoenebeck <linux_oss@crudebyte.com>
L: v9fs-developer@lists.sourceforge.net L: v9fs@lists.linux.dev
S: Maintained S: Maintained
W: http://swik.net/v9fs W: http://github.com/v9fs
Q: http://patchwork.kernel.org/project/v9fs-devel/list/ Q: http://patchwork.kernel.org/project/v9fs-devel/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
T: git git://github.com/martinetd/linux.git T: git git://github.com/martinetd/linux.git
......
...@@ -35,10 +35,12 @@ ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name, ...@@ -35,10 +35,12 @@ ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name,
return retval; return retval;
} }
if (attr_size > buffer_size) { if (attr_size > buffer_size) {
if (!buffer_size) /* request to get the attr_size */ if (buffer_size)
retval = attr_size;
else
retval = -ERANGE; retval = -ERANGE;
else if (attr_size > SSIZE_MAX)
retval = -EOVERFLOW;
else /* request to get the attr_size */
retval = attr_size;
} else { } else {
iov_iter_truncate(&to, attr_size); iov_iter_truncate(&to, attr_size);
retval = p9_client_read(attr_fid, 0, &to, &err); retval = p9_client_read(attr_fid, 0, &to, &err);
......
...@@ -280,6 +280,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) ...@@ -280,6 +280,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)
write_unlock(&xen_9pfs_lock); write_unlock(&xen_9pfs_lock);
for (i = 0; i < priv->num_rings; i++) { for (i = 0; i < priv->num_rings; i++) {
struct xen_9pfs_dataring *ring = &priv->rings[i];
cancel_work_sync(&ring->work);
if (!priv->rings[i].intf) if (!priv->rings[i].intf)
break; break;
if (priv->rings[i].irq > 0) if (priv->rings[i].irq > 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment