diff options
author | Mark H Weaver <mhw@netris.org> | 2017-08-15 03:10:14 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-08-15 03:10:14 -0400 |
commit | 09ec5a0f0c40afde63975af9e9203884dad86ea7 (patch) | |
tree | c85530d4a7ed433779d787a0c452ed0d4b7f0f0a /gnu/packages/patches/qemu-CVE-2017-11434.patch | |
parent | 3785e42e5219a86d9d8a5208ff18e97e0cbcbe78 (diff) | |
parent | 2d430f29231d0d817459d86e0fe15089372e9547 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/qemu-CVE-2017-11434.patch')
-rw-r--r-- | gnu/packages/patches/qemu-CVE-2017-11434.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/qemu-CVE-2017-11434.patch b/gnu/packages/patches/qemu-CVE-2017-11434.patch new file mode 100644 index 0000000000..4da701a73d --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2017-11434.patch @@ -0,0 +1,25 @@ +Fix CVE-2017-11434: + +https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg05001.html +https://bugzilla.redhat.com/show_bug.cgi?id=1472611 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11434 +https://security-tracker.debian.org/tracker/CVE-2017-11434 + +Patch copied from upstream source repository: + +https://git.qemu.org/gitweb.cgi?p=qemu.git;a=commit;h=413d463f43fbc4dd3a601e80a5724aa384a265a0 + +diff --git a/slirp/bootp.c b/slirp/bootp.c +index 5a4646c182..5dd1a415b5 100644 +--- a/slirp/bootp.c ++++ b/slirp/bootp.c +@@ -123,6 +123,9 @@ static void dhcp_decode(const struct bootp_t *bp, int *pmsg_type, + if (p >= p_end) + break; + len = *p++; ++ if (p + len > p_end) { ++ break; ++ } + DPRINTF("dhcp: tag=%d len=%d\n", tag, len); + + switch(tag) { |