[PATCH v4 27/30] netfs: Check for too much data being read
David Howells <[email protected]>
| Newsgroups | gmane.linux.nfs,gmane.linux.kernel.cifs,gmane.comp.file-systems.ceph.devel,gmane.linux.file-systems,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
Put in a check in read subreq termination to detect more data being read for a subrequest than was requested. Signed-off-by: David Howells <[email protected]> cc: Paulo Alcantara <[email protected]> cc: netfs-cunTk1MwBs/[email protected] cc: [email protected] --- fs/netfs/read_collect.c | 8 ++++++++ include/trace/events/netfs.h | 1 + 2 files changed, 9 insertions(+) diff --git a/fs/netfs/read_collect.c b/fs/netfs/read_collect.c index 802d1c40cce5..9efcc0e63a96 100644 --- a/fs/netfs/read_collect.c +++ b/fs/netfs/read_collect.c @@ -543,6 +543,14 @@ void netfs_read_subreq_terminated(struct netfs_io_subrequest *subreq) break; } + if (subreq->transferred > subreq->len) { + subreq->transferred = 0; + __set_bit(NETFS_SREQ_FAILED, &subreq->flags); + __clear_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags); + trace_netfs_sreq(subreq, netfs_sreq_trace_too_much); + subreq->error = -EIO; + } + /* Deal with retry requests, short reads and errors. If we retry * but don't make progress, we abandon the attempt. */ diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h index 59f330003d02..cc29582f6245 100644 --- a/include/trace/events/netfs.h +++ b/include/trace/events/netfs.h @@ -134,6 +134,7 @@ EM(netfs_sreq_trace_submit, "SUBMT") \ EM(netfs_sreq_trace_superfluous, "SPRFL") \ EM(netfs_sreq_trace_terminated, "TERM ") \ + EM(netfs_sreq_trace_too_much, "!TOOM") \ EM(netfs_sreq_trace_wait_for, "_WAIT") \ EM(netfs_sreq_trace_write, "WRITE") \ EM(netfs_sreq_trace_write_skip, "SKIP ") \