From: VMware, Inc <>
Date: Wed, 18 Sep 2013 03:19:54 +0000 (-0700)
Subject: HGFS: Server packet abstraction part IX
X-Git-Tag: 2013.09.16-1328054~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb80b3337a94be4668be732967ca453ca1b97359;p=thirdparty%2Fopen-vm-tools.git

HGFS: Server packet abstraction part IX

The HGFS server sets the packet's ID field as the HGFS protocol request
ID.  This should not occur and it overloads that the packet ID which
should be private to the transport channel which has nothing to do with
the HGFS request ID.  The HGFS request ID has it's own field in the HGFS
header used by the request and reply.

Remove the HGFS server modifying the packet ID.  This is currently safe,
as the clients do not receive any asynchronous replies from any HGFS
server where the packet ID in the reply is used.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---

diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c
index ebe09f3b6..b8bb1539c 100644
--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
@@ -3246,7 +3246,6 @@ HgfsServerSessionReceive(HgfsPacket *packet,      // IN: Hgfs Packet
       return;
    }
 
-   packet->id = input->id;
    HGFS_ASSERT_MINIMUM_OP(input->op);
    if (HGFS_ERROR_SUCCESS == status) {
       HGFS_ASSERT_INPUT(input);