Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

[~andy/linux] / drivers / hv / hv_kvp.c

diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c
index 89f52440fcf4fec368e6f3a09f53cf169a022aee..0e8343f585bb361d42bb71b52f5942a33da2a63f 100644 (file)
--- a/drivers/hv/hv_kvp.c
+++ b/drivers/hv/hv_kvp.c
@@ -212,11 +212,13 @@ kvp_respond_to_host(char *key, char *value, int error)
         * The windows host expects the key/value pair to be encoded
         * in utf16.
         */
-       keylen = utf8s_to_utf16s(key_name, strlen(key_name),
-                               (wchar_t *)kvp_data->data.key);
+       keylen = utf8s_to_utf16s(key_name, strlen(key_name), UTF16_HOST_ENDIAN,
+                               (wchar_t *) kvp_data->data.key,
+                               HV_KVP_EXCHANGE_MAX_KEY_SIZE / 2);
        kvp_data->data.key_size = 2*(keylen + 1); /* utf16 encoding */
-       valuelen = utf8s_to_utf16s(value, strlen(value),
-                               (wchar_t *)kvp_data->data.value);
+       valuelen = utf8s_to_utf16s(value, strlen(value), UTF16_HOST_ENDIAN,
+                               (wchar_t *) kvp_data->data.value,
+                               HV_KVP_EXCHANGE_MAX_VALUE_SIZE / 2);
        kvp_data->data.value_size = 2*(valuelen + 1); /* utf16 encoding */
 
        kvp_data->data.value_type = REG_SZ; /* all our values are strings */