From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: andrew.cooper3@citrix.com, mattjd@gmail.com, security@xen.org
Subject: [PATCH 21/21] libxc: check blob size before proceeding in xc_dom_check_gzip
Date: Thu, 13 Jun 2013 19:21:57 +0100 [thread overview]
Message-ID: <1371147717-21343-22-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1371147717-21343-1-git-send-email-ian.jackson@eu.citrix.com>
From: Matthew Daley <mattjd@gmail.com>
This is part of the fix to a security issue, XSA-55.
Signed-off-by: Matthew Daley <mattjd@gmail.com>
---
tools/libxc/xc_dom_core.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
index 3cbf9f7..f8d1b08 100644
--- a/tools/libxc/xc_dom_core.c
+++ b/tools/libxc/xc_dom_core.c
@@ -284,6 +284,11 @@ size_t xc_dom_check_gzip(xc_interface *xch, void *blob, size_t ziplen)
unsigned char *gzlen;
size_t unziplen;
+ if ( ziplen < 6 )
+ /* Too small. We need (i.e. the subsequent code relies on)
+ * 2 bytes for the magic number plus 4 bytes length. */
+ return 0;
+
if ( strncmp(blob, "\037\213", 2) )
/* not gzipped */
return 0;
--
1.7.2.5
next prev parent reply other threads:[~2013-06-13 18:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 18:21 [PATCH v8 00/21] XSA55 libelf fixes for Xen 4.1 Ian Jackson
2013-06-13 18:21 ` [PATCH 01/21] libelf: abolish libelf-relocate.c Ian Jackson
2013-06-13 18:21 ` [PATCH 02/21] libxc: introduce xc_dom_seg_to_ptr_pages Ian Jackson
2013-06-13 18:21 ` [PATCH 03/21] libxc: Fix range checking in xc_dom_pfn_to_ptr etc Ian Jackson
2013-06-13 18:21 ` [PATCH 04/21] libelf: abolish elf_sval and elf_access_signed Ian Jackson
2013-06-13 18:21 ` [PATCH 05/21] libelf/xc_dom_load_elf_symtab: Do not use "syms" uninitialised Ian Jackson
2013-06-13 18:21 ` [PATCH 06/21] libelf: introduce macros for memory access and pointer handling Ian Jackson
2013-06-13 18:21 ` [PATCH 07/21] tools/xcutils/readnotes: adjust print_l1_mfn_valid_note Ian Jackson
2013-06-13 18:21 ` [PATCH 08/21] libelf: check nul-terminated strings properly Ian Jackson
2013-06-13 18:21 ` [PATCH 09/21] libelf: check all pointer accesses Ian Jackson
2013-06-13 18:21 ` [PATCH 10/21] libelf: Check pointer references in elf_is_elfbinary Ian Jackson
2013-06-13 18:21 ` [PATCH 11/21] libelf: Make all callers call elf_check_broken Ian Jackson
2013-06-13 18:21 ` [PATCH 12/21] libelf: use C99 bool for booleans Ian Jackson
2013-06-13 18:21 ` [PATCH 13/21] libelf: use only unsigned integers Ian Jackson
2013-06-13 18:21 ` [PATCH 14/21] libxc: Introduce xc_bitops.h Ian Jackson
2013-06-13 18:21 ` [PATCH 15/21] libelf: check loops for running away Ian Jackson
2013-06-13 18:21 ` [PATCH 16/21] libelf: abolish obsolete macros Ian Jackson
2013-06-13 18:21 ` [PATCH 17/21] libxc: Add range checking to xc_dom_binloader Ian Jackson
2013-06-13 18:21 ` [PATCH 18/21] libxc: check failure of xc_dom_*_to_ptr, xc_map_foreign_range Ian Jackson
2013-06-13 18:21 ` [PATCH 19/21] libxc: check return values from malloc Ian Jackson
2013-06-13 18:21 ` [PATCH 20/21] libxc: range checks in xc_dom_p2m_host and _guest Ian Jackson
2013-06-13 18:21 ` Ian Jackson [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-12 16:00 [PATCH RFC v7 00/22] XSA55 libelf fixes for Xen 4.1 Ian Jackson
2013-06-12 16:00 ` [PATCH 21/21] libxc: check blob size before proceeding in xc_dom_check_gzip Ian Jackson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371147717-21343-22-git-send-email-ian.jackson@eu.citrix.com \
--to=ian.jackson@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=mattjd@gmail.com \
--cc=security@xen.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).