Skip to contentSkip to conversation

evaluate: error out when store needs more than one 128bit register of align fixup

PATCH New Florian Westphal 1 participant 1 message Jan 15, 2024 netfilter

lore
Share & tools
lore

Florian Westphal

author maintainer
#0 lore raw

PATCH 1/1 evaluate: error out when store needs more than one 128bit register of align fixup

Else this gives:
nft: evaluate.c:2983: stmt_evaluate_payload: Assertion `sizeof(data) * BITS_PER_BYTE >= masklen' failed.

For loads, this is already prevented via expr_evaluate_bits() which has:

if (masklen > NFT_REG_SIZE * BITS_PER_BYTE)

      return expr_error(ctx->msgs, expr, "mask length %u exceeds allowed maximum of %u\n",
                        masklen, NFT_REG_SIZE * BITS_PER_BYTE);

But for the store path this isn't called.
The reproducer asks to store a 128 bit integer at bit offset 1, i.e. 17 bytes would need to be munged, but we can only handle up to 16 bytes (one pseudo-register).

Fixes 78936d50f306 ("evaluate: add support to set IPv6 non-byte header fields")
---
 src/evaluate.c                                               | 5 +++++
 .../testcases/bogons/nft-f/payload_expr_unaligned_store      | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 tests/shell/testcases/bogons/nft-f/payload_expr_unaligned_store
src/evaluate.c +5 -0
index 5576b56ece67..1adec037b04b 100644
@@ -3188,6 +3188,11 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt)
 	payload_byte_size = div_round_up(payload->len + extra_len,
 					 BITS_PER_BYTE);
 
+	if (payload_byte_size > sizeof(data))
+		return expr_error(ctx->msgs, stmt->payload.expr,
+				  "uneven load cannot span more than %u bytes, got %u",
+				  sizeof(data), payload_byte_size);
+
 	if (need_csum && payload_byte_size & 1) {
 		payload_byte_size++;
 
tests/shell/testcases/bogons/nft-f/payload_expr_unaligned_store new file +1 -0
new file mode 100644
index 000000000000..c1358df45e93
@@ -0,0 +1 @@
+add rule f i @th,1,128 set 1
Signature · 1 line
2.43.0