2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From b314120afdbab3d29885f47fc83bc55f43765968 Mon Sep 17 00:00:00 2001
|
|
From: Michael Tokarev <mjt@tls.msk.ru>
|
|
Date: Sat, 14 Sep 2013 13:11:36 +0400
|
|
Subject: [PATCH] iov: avoid "orig_len may be used unitialized" warning
|
|
|
|
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
(cherry picked from commit 2be178a475289286db80de5ddd7830e67e112bdd)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
util/iov.c | 10 ++++------
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/util/iov.c b/util/iov.c
|
|
index f705586..bb46c04 100644
|
|
--- a/util/iov.c
|
|
+++ b/util/iov.c
|
|
@@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
|
|
assert(iov[niov].iov_len > tail);
|
|
orig_len = iov[niov].iov_len;
|
|
iov[niov++].iov_len = tail;
|
|
- }
|
|
-
|
|
- ret = do_send_recv(sockfd, iov, niov, do_send);
|
|
-
|
|
- /* Undo the changes above before checking for errors */
|
|
- if (tail) {
|
|
+ ret = do_send_recv(sockfd, iov, niov, do_send);
|
|
+ /* Undo the changes above before checking for errors */
|
|
iov[niov-1].iov_len = orig_len;
|
|
+ } else {
|
|
+ ret = do_send_recv(sockfd, iov, niov, do_send);
|
|
}
|
|
if (offset) {
|
|
iov[0].iov_base -= offset;
|