ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nbd patches for 2017-07-28 

- Philippe Mathieu-Daudé - nbd: fix memory leak in nbd_opt_go()
 -----BEGIN PGP SIGNATURE-----
 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg
 
 iQEcBAABCAAGBQJZe217AAoJEKeha0olJ0NqbRUIAIdzEUgOfXKOrihdsENF17cB
 CkkqM4H0coRgBkk0w94kAFxew20UC7zJ4c098NRZi5M88VyUj5c87fkz6SKzexnZ
 E4jJSaTwT/xx8NCfdW4R0joWlLnVsK150WMlmJBUkBEhbTUlW2xTdL+IqJORhJyv
 1LcVKCYOS+7hyPnJkXmWM8SSbRHd3y2ejnUBlzhdZLwpiJ5hg4538D8z35qK3nHK
 qrF9JRPVzfCOTopiH2MfjluP1J7PrVFiM32gyj/8OxvTT4v3t0Q26JLbX2AJybnF
 jUHvLhutxvHCKL9+p1QpyNiIdI4IBtirUOVmdJWsAZ4Rr+U/jLc+S1HpO3eV65g=
 =3Dal
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-07-28 18:17:44 +01:00
parent 3aabfec2c8 158b9aa568
commit a588c4985e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nbd/client.c
View File

@ -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;
}