From 95f7fc83b251efefcc2a603b936b55e2f0308a72 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 8 Apr 2013 10:49:03 -0700 Subject: [PATCH] Ensure the RECVFILE path in vfs_pwrite_data() operates on a blocking socket. Signed-off-by: Jeremy Allison Reviewed-by: Stefan (metze) Metzmacher Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Sat Apr 20 01:04:05 CEST 2013 on sn-devel-104 --- source3/smbd/vfs.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index dd74d7988001..49609d017941 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -472,14 +472,25 @@ ssize_t vfs_pwrite_data(struct smb_request *req, ssize_t ret; if (req && req->unread_bytes) { + int sockfd = req->sconn->sock; + int old_flags; SMB_ASSERT(req->unread_bytes == N); /* VFS_RECVFILE must drain the socket * before returning. */ req->unread_bytes = 0; - return SMB_VFS_RECVFILE(req->sconn->sock, + /* Ensure the socket is blocking. */ + old_flags = fcntl(sockfd, F_GETFL, 0); + if (set_blocking(sockfd, true) == -1) { + return (ssize_t)-1; + } + ret = SMB_VFS_RECVFILE(sockfd, fsp, offset, N); + if (fcntl(sockfd, F_SETFL, old_flags) == -1) { + return (ssize_t)-1; + } + return ret; } while (total < N) { -- 2.34.1