diff options
| author | Linus Torvalds | 2023-04-10 13:25:08 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2023-04-10 13:25:08 -0700 |
| commit | c118b59e71d2a910ee300f8be40fa864a91bb6ca (patch) | |
| tree | c6200c5449e1802a2c7ef66373d6185468051139 /net | |
| parent | 411eb014108594d160a20381e8738de6c62e2e5b (diff) | |
| parent | 347dca97f75d461ac2ac256b68e495dfc6f14d61 (diff) | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/trans_xen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index c64050e839ac..1fffe2bed5b0 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -280,6 +280,10 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) write_unlock(&xen_9pfs_lock); 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) break; if (priv->rings[i].irq > 0) |