#include <atalk/byteorder.h>
#include <atalk/netatalk_conf.h>
#include <atalk/volume.h>
+#include <atalk/dsi.h>
+#include <atalk/spotlight.h>
-#include "spotlight.h"
+#define MAX_SLQ_DAT (DSI_DATASIZ - 64)
+#define MAX_SLQ_TOC 8192
/**************************************************************************************************
* RPC data marshalling and unmarshalling
static int sl_pack_loop(DALLOC_CTX *query, char *buf, int offset, char *toc_buf, int *toc_idx);
static int sl_unpack_loop(DALLOC_CTX *query, const char *buf, int offset, uint count, const uint toc_offset, const uint encoding);
+/**************************************************************************************************
+ * Wrapper functions for the *VAL macros with bound checking
+ **************************************************************************************************/
+
+static int sivalc(char *buf, off_t off, off_t maxoff, uint32_t val)
+{
+ if (off + sizeof(val) >= maxoff) {
+ LOG(log_error, logtype_sl, "sivalc: off: %zd, maxoff: %zd", off, maxoff);
+ return -1;
+ }
+ SIVAL(buf, off, val);
+ return 0;
+}
+
+static int slvalc(char *buf, off_t off, off_t maxoff, uint64_t val)
+{
+ if (off + sizeof(val) >= maxoff) {
+ LOG(log_error, logtype_sl, "slvalc: off: %zd, maxoff: %zd", off, maxoff);
+ return -1;
+ }
+ SLVAL(buf, off, val);
+ return 0;
+}
+
/*
* Returns the UTF-16 string encoding, by checking the 2-byte byte order mark.
* If there is no byte order mark, -1 is returned.
static uint spotlight_get_utf16_string_encoding(const char *buf, int offset, int query_length, uint encoding) {
uint utf16_encoding;
- /* check for byte order mark */
- utf16_encoding = SL_ENC_BIG_ENDIAN;
- if (query_length >= 2) {
- uint16_t byte_order_mark;
- if (encoding == SL_ENC_LITTLE_ENDIAN)
- byte_order_mark = SVAL(buf, offset);
- else
- byte_order_mark = RSVAL(buf, offset);
+ /* Assumed encoding in absence of a bom is little endian */
+ utf16_encoding = SL_ENC_LITTLE_ENDIAN;
- if (byte_order_mark == 0xFFFE) {
- utf16_encoding = SL_ENC_BIG_ENDIAN | SL_ENC_UTF_16;
- }
- else if (byte_order_mark == 0xFEFF) {
+ if (query_length >= 2) {
+ uint8_t le_bom[] = {0xff, 0xfe};
+ uint8_t be_bom[] = {0xfe, 0xff};
+ if (memcmp(le_bom, buf + offset, sizeof(uint16_t)) == 0)
utf16_encoding = SL_ENC_LITTLE_ENDIAN | SL_ENC_UTF_16;
- }
+ else if (memcmp(be_bom, buf + offset, sizeof(uint16_t)) == 0)
+ utf16_encoding = SL_ENC_BIG_ENDIAN | SL_ENC_UTF_16;
}
return utf16_encoding;
static int sl_pack_float(double d, char *buf, int offset)
{
+ EC_INIT;
+
union {
double d;
uint64_t w;
} ieee_fp_union;
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_FLOAT, 2, 1));
- SLVAL(buf, offset + 8, ieee_fp_union.w);
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_FLOAT, 2, 1)) );
+ EC_ZERO( slvalc(buf, offset + 8, MAX_SLQ_DAT, ieee_fp_union.w) );
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + 2 * sizeof(uint64_t);
}
static int sl_pack_uint64(uint64_t u, char *buf, int offset)
{
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_INT64, 2, 1));
- SLVAL(buf, offset + 8, u);
+ EC_INIT;
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_INT64, 2, 1)) );
+ EC_ZERO( slvalc(buf, offset + 8, MAX_SLQ_DAT, u) );
+
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + 2 * sizeof(uint64_t);
}
static int sl_pack_bool(sl_bool_t bl, char *buf, int offset)
{
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_BOOL, 1, bl ? 1 : 0));
+ EC_INIT;
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_BOOL, 1, bl ? 1 : 0)) );
+
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + sizeof(uint64_t);
}
static int sl_pack_nil(char *buf, int offset)
{
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_NULL, 1, 1));
+ EC_INIT;
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_NULL, 1, 1)) );
+
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + sizeof(uint64_t);
}
static int sl_pack_date(sl_time_t t, char *buf, int offset)
{
+ EC_INIT;
uint64_t data = 0;
data = (t.tv_sec + SPOTLIGHT_TIME_DELTA) << 24;
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATE, 2, 1));
- SLVAL(buf, offset + 8, data);
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_DATE, 2, 1)) );
+ EC_ZERO( slvalc(buf, offset + 8, MAX_SLQ_DAT, data) );
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + 2 * sizeof(uint64_t);
}
static int sl_pack_uuid(sl_uuid_t *uuid, char *buf, int offset)
{
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_UUID, 3, 1));
+ EC_INIT;
+
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_UUID, 3, 1)) );
+ if (offset + 8 + 16 >= MAX_SLQ_DAT)
+ EC_FAIL;
memcpy(buf + offset + 8, uuid, 16);
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset + sizeof(uint64_t) + 16;
}
static int sl_pack_CNID(sl_cnids_t *cnids, char *buf, int offset, char *toc_buf, int *toc_idx)
{
- int len = 0, off = 0;
+ EC_INIT;
+ int off = 0, len;
int cnid_count = talloc_array_length(cnids->ca_cnids->dd_talloc_array);
uint64_t id;
- SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_CNIDS, (offset + SL_OFFSET_DELTA) / 8, 0));
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ EC_ZERO( slvalc(toc_buf, *toc_idx * 8, MAX_SLQ_TOC, sl_pack_tag(SQ_CPX_TYPE_CNIDS, (offset + SL_OFFSET_DELTA) / 8, 0)) );
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1)) );
*toc_idx += 1;
offset += 8;
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_CNIDS, 2 + cnid_count, 8 /* unknown meaning, but always 8 */));
+ len = cnid_count + 1;
+ if (cnid_count > 0)
+ len ++;
+
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_CNIDS, len, 8 /* unknown meaning, but always 8 */)) );
offset += 8;
if (cnid_count > 0) {
- SLVAL(buf, offset, sl_pack_tag(0x0add, cnid_count, cnids->ca_context));
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(cnids->ca_unkn1, cnid_count, cnids->ca_context)) );
offset += 8;
for (int i = 0; i < cnid_count; i++) {
memcpy(&id, cnids->ca_cnids->dd_talloc_array[i], sizeof(uint64_t));
- SLVAL(buf, offset, id);
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, id) );
offset += 8;
}
}
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
static int sl_pack_array(sl_array_t *array, char *buf, int offset, char *toc_buf, int *toc_idx)
{
+ EC_INIT;
int count = talloc_array_length(array->dd_talloc_array);
int octets = (offset + SL_OFFSET_DELTA) / 8;
- SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_ARRAY, octets, count));
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ EC_ZERO( slvalc(toc_buf, *toc_idx * 8, MAX_SLQ_TOC, sl_pack_tag(SQ_CPX_TYPE_ARRAY, octets, count)) );
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1)) );
*toc_idx += 1;
offset += 8;
- offset = sl_pack_loop(array, buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_loop(array, buf, offset, toc_buf, toc_idx) );
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
static int sl_pack_dict(sl_array_t *dict, char *buf, int offset, char *toc_buf, int *toc_idx)
{
- SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_DICT, (offset + SL_OFFSET_DELTA) / 8, talloc_array_length(dict->dd_talloc_array)));
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ EC_INIT;
+
+ EC_ZERO( slvalc(toc_buf,
+ *toc_idx * 8,
+ MAX_SLQ_TOC,
+ sl_pack_tag(SQ_CPX_TYPE_DICT,
+ (offset + SL_OFFSET_DELTA) / 8,
+ talloc_array_length(dict->dd_talloc_array))) );
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1)) );
*toc_idx += 1;
offset += 8;
- offset = sl_pack_loop(dict, buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_loop(dict, buf, offset, toc_buf, toc_idx) );
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
static int sl_pack_filemeta(sl_filemeta_t *fm, char *buf, int offset, char *toc_buf, int *toc_idx)
{
+ EC_INIT;
int fmlen; /* lenght of filemeta */
int saveoff = offset;
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1)) );
offset += 16;
- fmlen = sl_pack(fm, buf + offset);
- offset += fmlen;
+ EC_NEG1( fmlen = sl_pack(fm, buf + offset) );
- SLVAL(buf, saveoff + 8, sl_pack_tag(SQ_TYPE_DATA, (fmlen / 8) + 1, 8 /* unknown meaning, but always 8 */));
+ /* Check for empty filemeta array, if it's only 40 bytes, it's only the header but no content */
+ LOG(log_debug, logtype_sl, "fmlen: %d", fmlen);
+ if (fmlen > 40)
+ offset += fmlen;
+ else
+ fmlen = 0;
- SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_FILEMETA, (saveoff + SL_OFFSET_DELTA) / 8, fmlen / 8));
+ EC_ZERO( slvalc(buf, saveoff + 8, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_DATA, (fmlen / 8) + 1, 8 /* unknown meaning, but always 8 */)) );
+
+ EC_ZERO( slvalc(toc_buf, *toc_idx * 8, MAX_SLQ_TOC, sl_pack_tag(SQ_CPX_TYPE_FILEMETA, (saveoff + SL_OFFSET_DELTA) / 8, fmlen / 8)) );
*toc_idx += 1;
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
static int sl_pack_string(char *s, char *buf, int offset, char *toc_buf, int *toc_idx)
{
+ EC_INIT;
int len, octets, used_in_last_octet;
+
len = strlen(s);
octets = (len / 8) + (len & 7 ? 1 : 0);
used_in_last_octet = 8 - (octets * 8 - len);
- SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_STRING, (offset + SL_OFFSET_DELTA) / 8, used_in_last_octet));
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ EC_ZERO( slvalc(toc_buf, *toc_idx * 8, MAX_SLQ_TOC, sl_pack_tag(SQ_CPX_TYPE_STRING, (offset + SL_OFFSET_DELTA) / 8, used_in_last_octet)) );
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1)) );
*toc_idx += 1;
offset += 8;
- SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATA, octets + 1, used_in_last_octet));
+ EC_ZERO( slvalc(buf, offset, MAX_SLQ_DAT, sl_pack_tag(SQ_TYPE_DATA, octets + 1, used_in_last_octet)) );
offset += 8;
+ if (offset + octets * 8 > MAX_SLQ_DAT)
+ EC_FAIL;
memset(buf + offset, 0, octets * 8);
strncpy(buf + offset, s, len);
offset += octets * 8;
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
static int sl_pack_loop(DALLOC_CTX *query, char *buf, int offset, char *toc_buf, int *toc_idx)
{
+ EC_INIT;
const char *type;
for (int n = 0; n < talloc_array_length(query->dd_talloc_array); n++) {
type = talloc_get_name(query->dd_talloc_array[n]);
if (STRCMP(type, ==, "sl_array_t")) {
- offset = sl_pack_array(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_array(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx) );
} else if (STRCMP(type, ==, "sl_dict_t")) {
- offset = sl_pack_dict(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_dict(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx) );
} else if (STRCMP(type, ==, "sl_filemeta_t")) {
- offset = sl_pack_filemeta(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_filemeta(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx) );
} else if (STRCMP(type, ==, "uint64_t")) {
uint64_t i;
memcpy(&i, query->dd_talloc_array[n], sizeof(uint64_t));
- offset = sl_pack_uint64(i, buf, offset);
+ EC_NEG1( offset = sl_pack_uint64(i, buf, offset) );
} else if (STRCMP(type, ==, "char *")) {
- offset = sl_pack_string(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_string(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx) );
} else if (STRCMP(type, ==, "sl_bool_t")) {
sl_bool_t bl;
memcpy(&bl, query->dd_talloc_array[n], sizeof(sl_bool_t));
- offset = sl_pack_bool(bl, buf, offset);
+ EC_NEG1( offset = sl_pack_bool(bl, buf, offset) );
} else if (STRCMP(type, ==, "double")) {
double d;
memcpy(&d, query->dd_talloc_array[n], sizeof(double));
- offset = sl_pack_float(d, buf, offset);
+ EC_NEG1( offset = sl_pack_float(d, buf, offset) );
} else if (STRCMP(type, ==, "sl_nil_t")) {
- offset = sl_pack_nil(buf, offset);
+ EC_NEG1( offset = sl_pack_nil(buf, offset) );
} else if (STRCMP(type, ==, "sl_time_t")) {
sl_time_t t;
memcpy(&t, query->dd_talloc_array[n], sizeof(sl_time_t));
- offset = sl_pack_date(t, buf, offset);
+ EC_NEG1( offset = sl_pack_date(t, buf, offset) );
} else if (STRCMP(type, ==, "sl_uuid_t")) {
- offset = sl_pack_uuid(query->dd_talloc_array[n], buf, offset);
+ EC_NEG1( offset = sl_pack_uuid(query->dd_talloc_array[n], buf, offset) );
} else if (STRCMP(type, ==, "sl_cnids_t")) {
- offset = sl_pack_CNID(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ EC_NEG1( offset = sl_pack_CNID(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx) );
}
}
+EC_CLEANUP:
+ if (ret != 0)
+ return -1;
return offset;
}
uint64_t query_data64;
uint unicode_encoding;
uint8_t mark_exists;
- char *p;
+ char *p, *tmp;
int qlen, used_in_last_block, slen;
sl_array_t *sl_array;
sl_dict_t *sl_dict;
query_data64 = sl_unpack_uint64(buf, offset, encoding);
qlen = (query_data64 & 0xffff) * 8;
used_in_last_block = query_data64 >> 32;
- slen = qlen - 8 + used_in_last_block;
+ slen = qlen - 16 + used_in_last_block;
if (cpx_query_type == SQ_CPX_TYPE_STRING) {
p = dalloc_strndup(query, buf + offset + 8, slen);
} else {
unicode_encoding = spotlight_get_utf16_string_encoding(buf, offset + 8, slen, encoding);
mark_exists = (unicode_encoding & SL_ENC_UTF_16);
- unicode_encoding &= ~SL_ENC_UTF_16;
- EC_NEG1( convert_string_allocate(CH_UCS2, CH_UTF8, buf + offset + (mark_exists ? 18 : 16), slen, &p) );
+ if (unicode_encoding & SL_ENC_BIG_ENDIAN)
+ EC_FAIL_LOG("Unsupported big endian UTF16 string");
+ slen -= mark_exists ? 2 : 0;
+ EC_NEG1( convert_string_allocate(CH_UCS2,
+ CH_UTF8,
+ buf + offset + (mark_exists ? 10 : 8),
+ slen,
+ &tmp) );
+ p = dalloc_strndup(query, tmp, strlen(tmp));
+ free(tmp);
}
dalloc_add(query, p, char *);
* Global functions for packing und unpacking
**************************************************************************************************/
-#define MAX_SLQ_DAT 65000
-#define MAX_SLQ_TOC 2048
-
int sl_pack(DALLOC_CTX *query, char *buf)
{
EC_INIT;
memcpy(buf, "432130dm", 8);
EC_NEG1_LOG( len = sl_pack_loop(query, buf + 16, 0, toc_buf + 8, &toc_index) );
- SIVAL(buf, 8, len / 8 + 1 + toc_index + 1);
- SIVAL(buf, 12, len / 8 + 1);
+ EC_ZERO( sivalc(buf, 8, MAX_SLQ_DAT, len / 8 + 1 + toc_index + 1) );
+ EC_ZERO( sivalc(buf, 12, MAX_SLQ_DAT, len / 8 + 1) );
- SLVAL(toc_buf, 0, sl_pack_tag(SQ_TYPE_TOC, toc_index + 1, 0));
+ EC_ZERO( slvalc(toc_buf, 0, MAX_SLQ_TOC, sl_pack_tag(SQ_TYPE_TOC, toc_index + 1, 0)) );
+ if ((16 + len + ((toc_index + 1 ) * 8)) >= MAX_SLQ_DAT)
+ EC_FAIL;
memcpy(buf + 16 + len, toc_buf, (toc_index + 1 ) * 8);
-
len += 16 + (toc_index + 1 ) * 8;
EC_CLEANUP:
projects / netatalk.git / blobdiff