]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
CIFS: Do not hide EINTR after sending network packets
authorPavel Shilovsky <pshilov@microsoft.com>
Thu, 10 Jan 2019 19:27:28 +0000 (11:27 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Jan 2019 21:16:10 +0000 (22:16 +0100)
commit ee13919c2e8d1f904e035ad4b4239029a8994131 upstream.

Currently we hide EINTR code returned from sock_sendmsg()
and return 0 instead. This makes a caller think that we
successfully completed the network operation which is not
true. Fix this by properly returning EINTR to callers.

Cc: <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/cifs/transport.c

index 54af10204e83c6c3e6d53515c203b3ecf0f49f1e..1cf0a336ec06b32293ba4d8df977af1adc6158dd 100644 (file)
@@ -360,7 +360,7 @@ uncork:
        if (rc < 0 && rc != -EINTR)
                cifs_dbg(VFS, "Error %d sending data on socket to server\n",
                         rc);
-       else
+       else if (rc > 0)
                rc = 0;
 
        return rc;