Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

NFS: nfs_set_pgio_error sometimes misses errors

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.

Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

+2 -2
+2 -2
fs/nfs/pagelist.c
··· 77 77 void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos) 78 78 { 79 79 spin_lock(&hdr->lock); 80 - if (pos < hdr->io_start + hdr->good_bytes) { 81 - set_bit(NFS_IOHDR_ERROR, &hdr->flags); 80 + if (!test_and_set_bit(NFS_IOHDR_ERROR, &hdr->flags) 81 + || pos < hdr->io_start + hdr->good_bytes) { 82 82 clear_bit(NFS_IOHDR_EOF, &hdr->flags); 83 83 hdr->good_bytes = pos - hdr->io_start; 84 84 hdr->error = error;