From: Trond Myklebust Date: Mon, 17 Aug 2015 17:57:07 +0000 (-0500) Subject: NFS: nfs_set_pgio_error sometimes misses errors X-Git-Tag: v3.16.35~1365 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=721d693dc4dcee5a606609f3659d43b1dbfef6d8;p=thirdparty%2Fkernel%2Fstable.git NFS: nfs_set_pgio_error sometimes misses errors commit e9ae58aeee8842a50f7e199d602a5ccb2e41a95f upstream. We should ensure that we always set the pgio_header's error field if a READ or WRITE RPC call returns an error. The current code depends on 'hdr->good_bytes' always being initialised to a large value, which is not always done correctly by callers. When this happens, applications may end up missing important errors. Signed-off-by: Trond Myklebust Signed-off-by: Luis Henriques --- diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 54d049f930f7c..2bd81a6d308c1 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -63,8 +63,8 @@ EXPORT_SYMBOL_GPL(nfs_pgheader_init); void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos) { spin_lock(&hdr->lock); - if (pos < hdr->io_start + hdr->good_bytes) { - set_bit(NFS_IOHDR_ERROR, &hdr->flags); + if (!test_and_set_bit(NFS_IOHDR_ERROR, &hdr->flags) + || pos < hdr->io_start + hdr->good_bytes) { clear_bit(NFS_IOHDR_EOF, &hdr->flags); hdr->good_bytes = pos - hdr->io_start; hdr->error = error;