[qemu-xen master] ui: correctly advance output buffer when writing SASL data

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[qemu-xen master] ui: correctly advance output buffer when writing SASL data

commit 88ab85384da431950d319ab69438891c29e4a5dd
Author:     Daniel P. Berrangé <[hidden email]>
AuthorDate: Thu Feb 1 15:58:41 2018 +0000
Commit:     Michael Roth <[hidden email]>
CommitDate: Mon Feb 12 18:34:49 2018 -0600

    ui: correctly advance output buffer when writing SASL data
    In this previous commit:
      commit 8f61f1c5a6bc06438a1172efa80bc7606594fa07
      Author: Daniel P. Berrange <[hidden email]>
      Date:   Mon Dec 18 19:12:20 2017 +0000
        ui: track how much decoded data we consumed when doing SASL encoding
    I attempted to fix a flaw with tracking how much data had actually been
    processed when encoding with SASL. With that flaw, the VNC server could
    mistakenly discard queued data that had not been sent.
    The fix was not quite right though, because it merely decremented the
    vs->output.offset value. This is effectively discarding data from the
    end of the pending output buffer. We actually need to discard data from
    the start of the pending output buffer. We also want to free memory that
    is no longer required. The correct way to handle this is to use the
    buffer_advance() helper method instead of directly manipulating the
    offset value.
    Reported-by: Laszlo Ersek <[hidden email]>
    Signed-off-by: Daniel P. Berrangé <[hidden email]>
    Reviewed-by: Eric Blake <[hidden email]>
    Reviewed-by: Laszlo Ersek <[hidden email]>
    Message-id: [hidden email]
    Signed-off-by: Gerd Hoffmann <[hidden email]>
    (cherry picked from commit 627ebec208a8809818589e17f4fce55a59420ad2)
    Signed-off-by: Michael Roth <[hidden email]>
 ui/vnc-auth-sasl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index 74a5f51..fbccca8 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -84,7 +84,7 @@ size_t vnc_client_write_sasl(VncState *vs)
         } else {
             vs->force_update_offset -= vs->sasl.encodedRawLength;
-        vs->output.offset -= vs->sasl.encodedRawLength;
+        buffer_advance(&vs->output, vs->sasl.encodedRawLength);
         vs->sasl.encoded = NULL;
         vs->sasl.encodedOffset = vs->sasl.encodedLength = 0;
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

Xen-changelog mailing list
[hidden email]