| 1 |
commit: 07b6f997d19ce19197604ffc7b123497d635405c |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 26 19:06:15 2017 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 26 19:37:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b6f997 |
| 7 |
|
| 8 |
app-emulation/qemu: Bugfix: Fix patch file |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../qemu/files/qemu-2.9.0-CVE-2017-7539.patch | 22 +++++++++++----------- |
| 13 |
1 file changed, 11 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/qemu/files/qemu-2.9.0-CVE-2017-7539.patch b/app-emulation/qemu/files/qemu-2.9.0-CVE-2017-7539.patch |
| 16 |
index 3af16977b93..ee77a59373e 100644 |
| 17 |
--- a/app-emulation/qemu/files/qemu-2.9.0-CVE-2017-7539.patch |
| 18 |
+++ b/app-emulation/qemu/files/qemu-2.9.0-CVE-2017-7539.patch |
| 19 |
@@ -375,25 +375,25 @@ index 924a1fe..a1f106b 100644 |
| 20 |
|
| 21 |
magic = cpu_to_be64(NBD_REP_MAGIC); |
| 22 |
- if (nbd_negotiate_write(ioc, &magic, sizeof(magic)) != sizeof(magic)) { |
| 23 |
-+ if (nbd_write(ioc, &magic, sizeof(magic), NULL) < 0) { |
| 24 |
++ if (write_sync(ioc, &magic, sizeof(magic), NULL) < 0) { |
| 25 |
LOG("write failed (rep magic)"); |
| 26 |
return -EINVAL; |
| 27 |
} |
| 28 |
opt = cpu_to_be32(opt); |
| 29 |
- if (nbd_negotiate_write(ioc, &opt, sizeof(opt)) != sizeof(opt)) { |
| 30 |
-+ if (nbd_write(ioc, &opt, sizeof(opt), NULL) < 0) { |
| 31 |
++ if (write_sync(ioc, &opt, sizeof(opt), NULL) < 0) { |
| 32 |
LOG("write failed (rep opt)"); |
| 33 |
return -EINVAL; |
| 34 |
} |
| 35 |
type = cpu_to_be32(type); |
| 36 |
- if (nbd_negotiate_write(ioc, &type, sizeof(type)) != sizeof(type)) { |
| 37 |
-+ if (nbd_write(ioc, &type, sizeof(type), NULL) < 0) { |
| 38 |
++ if (write_sync(ioc, &type, sizeof(type), NULL) < 0) { |
| 39 |
LOG("write failed (rep type)"); |
| 40 |
return -EINVAL; |
| 41 |
} |
| 42 |
len = cpu_to_be32(len); |
| 43 |
- if (nbd_negotiate_write(ioc, &len, sizeof(len)) != sizeof(len)) { |
| 44 |
-+ if (nbd_write(ioc, &len, sizeof(len), NULL) < 0) { |
| 45 |
++ if (write_sync(ioc, &len, sizeof(len), NULL) < 0) { |
| 46 |
LOG("write failed (rep data length)"); |
| 47 |
return -EINVAL; |
| 48 |
} |
| 49 |
@@ -402,7 +402,7 @@ index 924a1fe..a1f106b 100644 |
| 50 |
goto out; |
| 51 |
} |
| 52 |
- if (nbd_negotiate_write(ioc, msg, len) != len) { |
| 53 |
-+ if (nbd_write(ioc, msg, len, NULL) < 0) { |
| 54 |
++ if (write_sync(ioc, msg, len, NULL) < 0) { |
| 55 |
LOG("write failed (error message)"); |
| 56 |
ret = -EIO; |
| 57 |
} else { |
| 58 |
@@ -411,17 +411,17 @@ index 924a1fe..a1f106b 100644 |
| 59 |
|
| 60 |
len = cpu_to_be32(name_len); |
| 61 |
- if (nbd_negotiate_write(ioc, &len, sizeof(len)) != sizeof(len)) { |
| 62 |
-+ if (nbd_write(ioc, &len, sizeof(len), NULL) < 0) { |
| 63 |
++ if (write_sync(ioc, &len, sizeof(len), NULL) < 0) { |
| 64 |
LOG("write failed (name length)"); |
| 65 |
return -EINVAL; |
| 66 |
} |
| 67 |
- if (nbd_negotiate_write(ioc, name, name_len) != name_len) { |
| 68 |
-+ if (nbd_write(ioc, name, name_len, NULL) < 0) { |
| 69 |
++ if (write_sync(ioc, name, name_len, NULL) < 0) { |
| 70 |
LOG("write failed (name buffer)"); |
| 71 |
return -EINVAL; |
| 72 |
} |
| 73 |
- if (nbd_negotiate_write(ioc, desc, desc_len) != desc_len) { |
| 74 |
-+ if (nbd_write(ioc, desc, desc_len, NULL) < 0) { |
| 75 |
++ if (write_sync(ioc, desc, desc_len, NULL) < 0) { |
| 76 |
LOG("write failed (description buffer)"); |
| 77 |
return -EINVAL; |
| 78 |
} |
| 79 |
@@ -524,13 +524,13 @@ index 924a1fe..a1f106b 100644 |
| 80 |
goto fail; |
| 81 |
} |
| 82 |
- if (nbd_negotiate_write(client->ioc, buf, sizeof(buf)) != sizeof(buf)) { |
| 83 |
-+ if (nbd_write(client->ioc, buf, sizeof(buf), NULL) < 0) { |
| 84 |
++ if (write_sync(client->ioc, buf, sizeof(buf), NULL) < 0) { |
| 85 |
LOG("write failed"); |
| 86 |
goto fail; |
| 87 |
} |
| 88 |
} else { |
| 89 |
- if (nbd_negotiate_write(client->ioc, buf, 18) != 18) { |
| 90 |
-+ if (nbd_write(client->ioc, buf, 18, NULL) < 0) { |
| 91 |
++ if (write_sync(client->ioc, buf, 18, NULL) < 0) { |
| 92 |
LOG("write failed"); |
| 93 |
goto fail; |
| 94 |
} |
| 95 |
@@ -539,7 +539,7 @@ index 924a1fe..a1f106b 100644 |
| 96 |
stw_be_p(buf + 26, client->exp->nbdflags | myflags); |
| 97 |
len = client->no_zeroes ? 10 : sizeof(buf) - 18; |
| 98 |
- if (nbd_negotiate_write(client->ioc, buf + 18, len) != len) { |
| 99 |
-+ if (nbd_write(client->ioc, buf + 18, len, NULL) < 0) { |
| 100 |
++ if (write_sync(client->ioc, buf + 18, len, NULL) < 0) { |
| 101 |
LOG("write failed"); |
| 102 |
goto fail; |
| 103 |
} |
Archives