Skip to content

Commit c118b59

Browse files
committed
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
2 parents 411eb01 + 347dca9 commit c118b59

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ S: Orphan / Obsolete
224224
F: drivers/net/ethernet/8390/
225225

226226
9P FILE SYSTEM
227-
M: Eric Van Hensbergen <ericvh@gmail.com>
227+
M: Eric Van Hensbergen <ericvh@kernel.org>
228228
M: Latchesar Ionkov <[email protected]>
229229
M: Dominique Martinet <[email protected]>
230230
R: Christian Schoenebeck <[email protected]>
231-
L: v9fs-developer@lists.sourceforge.net
231+
L: v9fs@lists.linux.dev
232232
S: Maintained
233-
W: http://swik.net/v9fs
233+
W: http://github.com/v9fs
234234
Q: http://patchwork.kernel.org/project/v9fs-devel/list/
235235
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
236236
T: git git://github.com/martinetd/linux.git

fs/9p/xattr.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ ssize_t v9fs_fid_xattr_get(struct p9_fid *fid, const char *name,
3535
return retval;
3636
}
3737
if (attr_size > buffer_size) {
38-
if (!buffer_size) /* request to get the attr_size */
39-
retval = attr_size;
40-
else
38+
if (buffer_size)
4139
retval = -ERANGE;
40+
else if (attr_size > SSIZE_MAX)
41+
retval = -EOVERFLOW;
42+
else /* request to get the attr_size */
43+
retval = attr_size;
4244
} else {
4345
iov_iter_truncate(&to, attr_size);
4446
retval = p9_client_read(attr_fid, 0, &to, &err);

net/9p/trans_xen.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv)
280280
write_unlock(&xen_9pfs_lock);
281281

282282
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+
283287
if (!priv->rings[i].intf)
284288
break;
285289
if (priv->rings[i].irq > 0)

0 commit comments

Comments
 (0)