Linus Torvalds 1f7a4c73a7 Pull request for inclusion in 4.19, take two ... This tag is the same as 9p-for-4.19 without the two MAINTAINERS patches Contains mostly fixes (6 to be backported to stable) and a few changes, here is the breakdown: * Rework how fids are attributed by replacing some custom tracking in a list by an idr (f28cdf0430) * For packet-based transports (virtio/rdma) validate that the packet length matches what the header says (f984579a01) * A few race condition fixes found by syzkaller (9f476d7c54, 430ac66eb4) * Missing argument check when NULL device is passed in sys_mount (10aa14527f) * A few virtio fixes (23cba9cbde, 31934da810, d28c756cae) * Some spelling and style fixes ---------------------------------------------------------------- Chirantan Ekbote (1): 9p/net: Fix zero-copy path in the 9p virtio transport Colin Ian King (1): fs/9p/v9fs.c: fix spelling mistake "Uknown" -> "Unknown" Jean-Philippe Brucker (1): net/9p: fix error path of p9_virtio_probe Matthew Wilcox (4): 9p: Fix comment on smp_wmb 9p: Change p9_fid_create calling convention 9p: Replace the fidlist with an IDR 9p: Embed wait_queue_head into p9_req_t Souptick Joarder (1): fs/9p/vfs_file.c: use new return type vm_fault_t Stephen Hemminger (1): 9p: fix whitespace issues Tomas Bortoli (5): net/9p/client.c: version pointer uninitialized net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree() net/9p/trans_fd.c: fix race by holding the lock 9p: validate PDU length 9p: fix multiple NULL-pointer-dereferences jiangyiwen (2): net/9p/virtio: Fix hard lockup in req_done 9p/virtio: fix off-by-one error in sg list bounds check piaojun (5): net/9p/client.c: add missing '\n' at the end of p9_debug() 9p/net/protocol.c: return -ENOMEM when kmalloc() failed net/9p/trans_virtio.c: fix some spell mistakes in comments fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed net/9p/trans_virtio.c: add null terminal for mount tag fs/9p/v9fs.c | 2 +- fs/9p/vfs_file.c | 2 +- fs/9p/xattr.c | 6 ++++-- include/net/9p/client.h | 11 ++++------- net/9p/client.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------- net/9p/protocol.c | 2 +- net/9p/trans_fd.c | 22 +++++++++++++++------- net/9p/trans_rdma.c | 4 ++++ net/9p/trans_virtio.c | 66 +++++++++++++++++++++++++++++++++++++--------------------------- net/9p/trans_xen.c | 3 +++ net/9p/util.c | 1 - 12 files changed, 122 insertions(+), 116 deletions(-) -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQQ8idm2ZSicIMLgzKqoqIItDqvwPAUCW3ElNwAKCRCoqIItDqvw PMzfAKCkCYFyNC89vcpxcCNsK7rFQ1qKlwCgoaBpZDdegOu0jMB7cyKwAWrB0LM= =h3T0 -----END PGP SIGNATURE----- Merge tag '9p-for-4.19-2' of git://github.com/martinetd/linux Pull 9p updates from Dominique Martinet: "This contains mostly fixes (6 to be backported to stable) and a few changes, here is the breakdown: - rework how fids are attributed by replacing some custom tracking in a list by an idr - for packet-based transports (virtio/rdma) validate that the packet length matches what the header says - a few race condition fixes found by syzkaller - missing argument check when NULL device is passed in sys_mount - a few virtio fixes - some spelling and style fixes" * tag '9p-for-4.19-2' of git://github.com/martinetd/linux: (21 commits) net/9p/trans_virtio.c: add null terminal for mount tag 9p/virtio: fix off-by-one error in sg list bounds check 9p: fix whitespace issues 9p: fix multiple NULL-pointer-dereferences fs/9p/xattr.c: catch the error of p9_client_clunk when setting xattr failed 9p: validate PDU length net/9p/trans_fd.c: fix race by holding the lock net/9p/trans_fd.c: fix race-condition by flushing workqueue before the kfree() net/9p/virtio: Fix hard lockup in req_done net/9p/trans_virtio.c: fix some spell mistakes in comments 9p/net: Fix zero-copy path in the 9p virtio transport 9p: Embed wait_queue_head into p9_req_t 9p: Replace the fidlist with an IDR 9p: Change p9_fid_create calling convention 9p: Fix comment on smp_wmb net/9p/client.c: version pointer uninitialized fs/9p/v9fs.c: fix spelling mistake "Uknown" -> "Unknown" net/9p: fix error path of p9_virtio_probe 9p/net/protocol.c: return -ENOMEM when kmalloc() failed net/9p/client.c: add missing '\n' at the end of p9_debug() ...		2018-08-17 17:27:58 -07:00
..
client.c	9p: fix whitespace issues	2018-08-13 09:34:58 +09:00
error.c
Kconfig	IB: Revert "remove redundant INFINIBAND kconfig dependencies"	2018-05-28 10:40:16 -06:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mod.c	net:mod: remove unneeded variable 'ret' in init_p9	2018-08-08 09:40:44 -07:00
protocol.c	9p/net/protocol.c: return -ENOMEM when kmalloc() failed	2018-08-13 09:21:44 +09:00
protocol.h
trans_common.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_common.h
trans_fd.c	9p: fix multiple NULL-pointer-dereferences	2018-08-13 09:34:58 +09:00
trans_rdma.c	Pull request for inclusion in 4.19, take two	2018-08-17 17:27:58 -07:00
trans_virtio.c	9p/virtio: fix off-by-one error in sg list bounds check	2018-08-13 09:35:28 +09:00
trans_xen.c	9p: fix multiple NULL-pointer-dereferences	2018-08-13 09:34:58 +09:00
util.c	9p: fix whitespace issues	2018-08-13 09:34:58 +09:00