qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	"Fakhri Zulkifli" <mohdfakhrizulkifli@gmail.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	"Sameeh Jubran" <sjubran@redhat.com>,
	"Basil Salman" <basil@daynix.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Dietmar Maurer" <dietmar@proxmox.com>
Subject: [PATCH-for-5.0 v2 1/4] Revert "prevent crash when executing guest-file-read with large count"
Date: Tue, 31 Mar 2020 16:06:35 +0200	[thread overview]
Message-ID: <20200331140638.16464-2-philmd@redhat.com> (raw)
In-Reply-To: <20200331140638.16464-1-philmd@redhat.com>

By using g_try_malloc() instead of g_malloc() the qemu-guest-agent
Denial-of-Service attack referred in commit 807e2b6fce is reduced,
but still triggerable:

  - bisect file size S until g_try_malloc(S) fails,
  - use S - 1:
    g_try_malloc(S - 1) succeeds, but g_new0() few lines later will
    fail.

 346     buf = g_try_malloc0(count + 1);
 347     if (!buf) {
 348         error_setg(errp,
 349                    "failed to allocate sufficient memory "
 350                    "to complete the requested service");
 351         return NULL;
 352     }
 353     is_ok = ReadFile(fh, buf, count, &read_count, NULL);
 354     if (!is_ok) {
 355         error_setg_win32(errp, GetLastError(), "failed to read file");
 356         slog("guest-file-read failed, handle %" PRId64, handle);
 357     } else {
 358         buf[read_count] = 0;
 359         read_data = g_new0(GuestFileRead, 1);
                         ^^^^^^

Instead we are going to put a low hard limit on 'count' in the next
commits.
This reverts commit 807e2b6fce022707418bc8f61c069d91c613b3d2.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 qga/commands-win32.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index b49920e201..46cea7d1d9 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -343,13 +343,7 @@ GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count,
     }
 
     fh = gfh->fh;
-    buf = g_try_malloc0(count + 1);
-    if (!buf) {
-        error_setg(errp,
-                   "failed to allocate sufficient memory "
-                   "to complete the requested service");
-        return NULL;
-    }
+    buf = g_malloc0(count + 1);
     is_ok = ReadFile(fh, buf, count, &read_count, NULL);
     if (!is_ok) {
         error_setg_win32(errp, GetLastError(), "failed to read file");
-- 
2.21.1



  reply	other threads:[~2020-03-31 14:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 14:06 [PATCH-for-5.0 v2 0/4] qga: Restrict guest-file-read count to 10 MB to avoid crashes Philippe Mathieu-Daudé
2020-03-31 14:06 ` Philippe Mathieu-Daudé [this message]
2020-03-31 14:12   ` [PATCH-for-5.0 v2 1/4] Revert "prevent crash when executing guest-file-read with large count" Daniel P. Berrangé
2020-03-31 14:15     ` Philippe Mathieu-Daudé
2020-03-31 14:06 ` [PATCH-for-5.0 v2 2/4] qga: Extract guest_file_handle_find() to commands-common.h Philippe Mathieu-Daudé
2020-03-31 14:06 ` [PATCH-for-5.0 v2 3/4] qga: Extract qmp_guest_file_read() to common commands.c Philippe Mathieu-Daudé
2020-03-31 14:06 ` [PATCH-for-5.0 v2 4/4] qga: Restrict guest-file-read count to 10 MB to avoid crashes Philippe Mathieu-Daudé
2020-03-31 14:15   ` Daniel P. Berrangé
2020-03-31 14:17     ` Philippe Mathieu-Daudé
2020-04-02 13:09   ` Markus Armbruster
2020-04-03  9:23     ` Daniel P. Berrangé
2020-04-03 12:07       ` Markus Armbruster

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=20200331140638.16464-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=armbru@redhat.com \
    --cc=basil@daynix.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=dietmar@proxmox.com \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mohdfakhrizulkifli@gmail.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sjubran@redhat.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).