From 8b20a4d15e0811150c4be3aa61fd5f59ed668084 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Feb 2017 20:15:37 +0100 Subject: gnu: virglrenderer: Update to 0.6.0 [security fixes]. Fixes CVE-2016-{10163,10214} and CVE-2017-{5580,5937}. * gnu/packages/spice.scm (virglrenderer): Update to 0.6.0. --- gnu/packages/spice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/spice.scm') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 805f47a600..9600905848 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -96,7 +96,7 @@ (define-public virglrenderer (package (name "virglrenderer") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append @@ -104,7 +104,7 @@ "virglrenderer-" version ".tar.bz2")) (sha256 (base32 - "1dj0j8nbyr7nrpds4dqlp43ji8ixjyqhgw6ywlz1r9dn6cs5m5d1")))) + "06kf0q4l52gzx5p63l8850hff8pmhp7xv1hk8zgx2apbw18y6jd5")))) (build-system gnu-build-system) (inputs `(("libepoxy" ,libepoxy) -- cgit v1.2.3 From ae953ead0faf115e5d16f15b48a3c2316228a8f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Feb 2017 19:12:10 +0100 Subject: gnu: spice: Fix CVE-2016-9577 and CVE-2016-9578. * gnu/packages/patches/spice-CVE-2016-9577.patch, gnu/packages/patches/spice-CVE-2016-9578-1.patch, gnu/packages/patches/spice-CVE-2016-9578-2.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/spice.scm (spice)[source]: Use them. --- gnu/local.mk | 3 ++ gnu/packages/patches/spice-CVE-2016-9577.patch | 33 ++++++++++++++++++++ gnu/packages/patches/spice-CVE-2016-9578-1.patch | 33 ++++++++++++++++++++ gnu/packages/patches/spice-CVE-2016-9578-2.patch | 38 ++++++++++++++++++++++++ gnu/packages/spice.scm | 6 +++- 5 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/spice-CVE-2016-9577.patch create mode 100644 gnu/packages/patches/spice-CVE-2016-9578-1.patch create mode 100644 gnu/packages/patches/spice-CVE-2016-9578-2.patch (limited to 'gnu/packages/spice.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 24989461e2..2a054ea64b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -900,6 +900,9 @@ dist_patch_DATA = \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \ %D%/packages/patches/soprano-find-clucene.patch \ + %D%/packages/patches/spice-CVE-2016-9577.patch \ + %D%/packages/patches/spice-CVE-2016-9578-1.patch \ + %D%/packages/patches/spice-CVE-2016-9578-2.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/superlu-dist-scotchmetis.patch \ %D%/packages/patches/swish-e-search.patch \ diff --git a/gnu/packages/patches/spice-CVE-2016-9577.patch b/gnu/packages/patches/spice-CVE-2016-9577.patch new file mode 100644 index 0000000000..a2cb558cd3 --- /dev/null +++ b/gnu/packages/patches/spice-CVE-2016-9577.patch @@ -0,0 +1,33 @@ +Prevent buffer overflow when reading large messages. + +https://bugzilla.redhat.com/show_bug.cgi?id=1401603 +https://access.redhat.com/security/cve/CVE-2016-9577 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-9577 +https://security-tracker.debian.org/tracker/CVE-2016-9577 + +Patch copied from upstream source repository: + +https://cgit.freedesktop.org/spice/spice/commit/?h=0.12&id=5f96b596353d73bdf4bb3cd2de61e48a7fd5b4c3 + +From 5f96b596353d73bdf4bb3cd2de61e48a7fd5b4c3 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 29 Nov 2016 16:46:56 +0000 +Subject: main-channel: Prevent overflow reading messages from client + +diff --git a/server/main_channel.c b/server/main_channel.c +index 0ecc9df..1fc3915 100644 +--- a/server/main_channel.c ++++ b/server/main_channel.c +@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, + + if (type == SPICE_MSGC_MAIN_AGENT_DATA) { + return reds_get_agent_data_buffer(mcc, size); ++ } else if (size > sizeof(main_chan->recv_buf)) { ++ /* message too large, caller will log a message and close the connection */ ++ return NULL; + } else { + return main_chan->recv_buf; + } +-- +cgit v0.10.2 + diff --git a/gnu/packages/patches/spice-CVE-2016-9578-1.patch b/gnu/packages/patches/spice-CVE-2016-9578-1.patch new file mode 100644 index 0000000000..f86cdb4eb1 --- /dev/null +++ b/gnu/packages/patches/spice-CVE-2016-9578-1.patch @@ -0,0 +1,33 @@ +Prevent possible DoS during protocol handshake. + +https://bugzilla.redhat.com/show_bug.cgi?id=1399566 +https://access.redhat.com/security/cve/CVE-2016-9578 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-9578 +https://security-tracker.debian.org/tracker/CVE-2016-9578 + +Patch copied from upstream source repository: + +https://cgit.freedesktop.org/spice/spice/commit/?h=0.12&id=f66dc643635518e53dfbe5262f814a64eec54e4a + +From 1c6517973095a67c8cb57f3550fc1298404ab556 Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 13 Dec 2016 14:39:48 +0000 +Subject: Prevent possible DoS attempts during protocol handshake + +diff --git a/server/reds.c b/server/reds.c +index f40b65c..86a33d5 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -2202,7 +2202,8 @@ static void reds_handle_read_header_done(void *opaque) + + reds->peer_minor_version = header->minor_version; + +- if (header->size < sizeof(SpiceLinkMess)) { ++ /* the check for 4096 is to avoid clients to cause arbitrary big memory allocations */ ++ if (header->size < sizeof(SpiceLinkMess) || header->size > 4096) { + reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); + spice_warning("bad size %u", header->size); + reds_link_free(link); +-- +cgit v0.10.2 + diff --git a/gnu/packages/patches/spice-CVE-2016-9578-2.patch b/gnu/packages/patches/spice-CVE-2016-9578-2.patch new file mode 100644 index 0000000000..76f7ec7ffb --- /dev/null +++ b/gnu/packages/patches/spice-CVE-2016-9578-2.patch @@ -0,0 +1,38 @@ +Fixes a potential buffer overflow in the protocol handling. + +https://bugzilla.redhat.com/show_bug.cgi?id=1399566 +https://access.redhat.com/security/cve/CVE-2016-9578 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-9578 +https://security-tracker.debian.org/tracker/CVE-2016-9578 + +Patch copied from upstream source repository: + +https://cgit.freedesktop.org/spice/spice/commit/?h=0.12&id=f66dc643635518e53dfbe5262f814a64eec54e4a + +From f66dc643635518e53dfbe5262f814a64eec54e4a Mon Sep 17 00:00:00 2001 +From: Frediano Ziglio +Date: Tue, 13 Dec 2016 14:40:10 +0000 +Subject: Prevent integer overflows in capability checks + +diff --git a/server/reds.c b/server/reds.c +index 86a33d5..9150454 100644 +--- a/server/reds.c ++++ b/server/reds.c +@@ -2110,6 +2110,14 @@ static void reds_handle_read_link_done(void *opaque) + link_mess->num_channel_caps = GUINT32_FROM_LE(link_mess->num_channel_caps); + link_mess->num_common_caps = GUINT32_FROM_LE(link_mess->num_common_caps); + ++ /* Prevent DoS. Currently we defined only 13 capabilities, ++ * I expect 1024 to be valid for quite a lot time */ ++ if (link_mess->num_channel_caps > 1024 || link_mess->num_common_caps > 1024) { ++ reds_send_link_error(link, SPICE_LINK_ERR_INVALID_DATA); ++ reds_link_free(link); ++ return; ++ } ++ + num_caps = link_mess->num_common_caps + link_mess->num_channel_caps; + caps = (uint32_t *)((uint8_t *)link_mess + link_mess->caps_offset); + +-- +cgit v0.10.2 + diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 9600905848..5a6188e032 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -208,7 +208,11 @@ which allows users to view a desktop computing environment.") "spice-" version ".tar.bz2")) (sha256 (base32 - "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr")))) + "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr")) + (patches + (search-patches "spice-CVE-2016-9577.patch" + "spice-CVE-2016-9578-1.patch" + "spice-CVE-2016-9578-2.patch")))) (build-system gnu-build-system) (propagated-inputs `(("openssl" ,openssl) -- cgit v1.2.3 From 5e569d5c4145c05ee44a215d03e8e272b522b5ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Feb 2017 19:35:35 +0100 Subject: gnu: spice-protocol: Update to 0.12.12. * gnu/packages/spice.scm (spice-protocol): Update to 0.12.12. [source, home-page]: Use HTTPS. --- gnu/packages/spice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/spice.scm') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 5a6188e032..27de4b41c5 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -121,21 +121,21 @@ system to use the host GPU to accelerate 3D rendering.") (define-public spice-protocol (package (name "spice-protocol") - (version "0.12.11") + (version "0.12.12") (source (origin (method url-fetch) (uri (string-append - "http://www.spice-space.org/download/releases/" + "https://www.spice-space.org/download/releases/" "spice-protocol-" version ".tar.bz2")) (sha256 (base32 - "0c33kg3vdz3nnl2wjfbgmszz5hbjbvsw6map35dj9hxnpwwf9fi2")))) + "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp")))) (build-system gnu-build-system) (synopsis "Protocol headers for the SPICE protocol") (description "SPICE (the Simple Protocol for Independent Computing Environments) is a remote-display system built for virtual environments which allows users to view a desktop computing environment.") - (home-page "http://www.spice-space.org") + (home-page "https://www.spice-space.org") (license (list license:bsd-3 license:lgpl2.1+)))) (define-public spice-gtk -- cgit v1.2.3 From f057755e6e9f4b563f5926355948418ab7d97eb9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 11 Feb 2017 19:36:14 +0100 Subject: gnu: spice-gtk: Update to 0.33. * gnu/packages/spice.scm (spice-gtk): Update to 0.33. [source, home-page]: Use HTTPS. --- gnu/packages/spice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/spice.scm') diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 27de4b41c5..e775174e23 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -141,15 +141,15 @@ which allows users to view a desktop computing environment.") (define-public spice-gtk (package (name "spice-gtk") - (version "0.32") + (version "0.33") (source (origin (method url-fetch) (uri (string-append - "http://spice-space.org/download/gtk/" + "https://spice-space.org/download/gtk/" "spice-gtk-" version ".tar.bz2")) (sha256 (base32 - "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c")))) + "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx")))) (build-system gnu-build-system) (propagated-inputs `(("gstreamer" ,gstreamer) @@ -194,7 +194,7 @@ which allows users to view a desktop computing environment.") #t))))) (synopsis "Gtk client and libraries for SPICE remote desktop servers") (description "Gtk client and libraries for SPICE remote desktop servers.") - (home-page "http://www.spice-space.org") + (home-page "https://www.spice-space.org") (license (list license:lgpl2.1+ license:lgpl2.0+)))) (define-public spice -- cgit v1.2.3