payload: fix endianess issue in payload_expr_pctx_update()

Use constant_data_ptr() to point to the right memory position on
big endian when exporting data that is stored in a larger variable.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Tested-by: Christophe Leroy <christophe.leroy@c-s.fr>

diff --git a/src/datatype.c b/src/datatype.c
index fd3573efd81d449f395aa72fb5c2f90468135f6a..729e63b0e4839433157919b2f96c947bc1a37e4f 100644 (file)
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -158,8 +158,8 @@ void symbolic_constant_print(const struct symbol_table *tbl,
 
        /* Export the data in the correct byteorder for comparison */
        assert(expr->len / BITS_PER_BYTE <= sizeof(val));
-       mpz_export_data(&val, expr->value, expr->byteorder,
-                       expr->len / BITS_PER_BYTE);
+       mpz_export_data(constant_data_ptr(val, expr->len), expr->value,
+                       expr->byteorder, expr->len / BITS_PER_BYTE);
 
        for (s = tbl->symbols; s->identifier != NULL; s++) {
                if (val == s->value)

diff --git a/src/payload.c b/src/payload.c
index ebf8079b00a87a358f70e4d0382bd2b17d25371b..83742fb079fb021b10d0ca828d4342f9890d232e 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -79,8 +79,8 @@ static void payload_expr_pctx_update(struct proto_ctx *ctx,
 
        /* Export the data in the correct byte order */
        assert(right->len / BITS_PER_BYTE <= sizeof(proto));
-       mpz_export_data(&proto, right->value, right->byteorder,
-                       right->len / BITS_PER_BYTE);
+       mpz_export_data(constant_data_ptr(proto, right->len), right->value,
+                       right->byteorder, right->len / BITS_PER_BYTE);
 
        base = ctx->protocol[left->payload.base].desc;
        desc = proto_find_upper(base, proto);