Commit 27e5eae4 authored by Hani Benhabiles's avatar Hani Benhabiles Committed by Paolo Bonzini
Browse files

nbd: Shutdown socket before closing. 



This forces finishing data sending to client before closing the socket like in
exports listing or replying with NBD_REP_ERR_UNSUP cases.

Signed-off-by: default avatarHani Benhabiles <kroosec@gmail.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8c5d1abb

blockdev-nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static void nbd_accept(void *opaque) 


    int fd = accept(server_fd, (struct sockaddr *)&addr, &addr_len);

    if (fd >= 0 && !nbd_client_new(NULL, fd, nbd_client_put)) {

        shutdown(fd, 2);

        close(fd);

    }

}

qemu-nbd.c

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static void nbd_accept(void *opaque) 
    if (nbd_client_new(exp, fd, nbd_client_closed)) {

        nb_fds++;

    } else {

        shutdown(fd, 2);

        close(fd);

    }

}