Commit a588c498 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-07-28' into staging 



nbd patches for 2017-07-28

- Philippe Mathieu-Daudé - nbd: fix memory leak in nbd_opt_go()

# gpg: Signature made Fri 28 Jul 2017 17:59:39 BST
# gpg:                using RSA key 0xA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>"
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2017-07-28:
  nbd: fix memory leak in nbd_opt_go()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3aabfec2 158b9aa5

nbd/client.c

+5 −3
Original line number Diff line number Diff line
@@ -376,9 +376,11 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname, 
    if (info->request_sizes) {

        stw_be_p(buf + 4 + len + 2, NBD_INFO_BLOCK_SIZE);

    }

    if (nbd_send_option_request(ioc, NBD_OPT_GO,

                                4 + len + 2 + 2 * info->request_sizes, buf,

                                errp) < 0) {

    error = nbd_send_option_request(ioc, NBD_OPT_GO,

                                    4 + len + 2 + 2 * info->request_sizes,

                                    buf, errp);

    g_free(buf);

    if (error < 0) {

        return -1;

    }