diff options
author | Florian Westphal <fw@strlen.de> | 2023-12-12 15:01:17 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2023-12-12 16:11:15 +0100 |
commit | bc2afbde9eae491bcef23ef5b24b25c7605ad911 (patch) | |
tree | becc43a77fdf77975b5cfa3f61de8dea7cf4ee7c /src/expr/immediate.c | |
parent | ff117f50d2f99c03a65b4952b1a6988a8adc700f (diff) |
expr: fix buffer overflows in data value setters
The data value setters memcpy() to a fixed-size buffer, but its very easy
to make nft pass too-larger values. Example:
@th,160,1272 gt 0
ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60b000[..]
Truncate the copy instead of corrupting the heap.
This needs additional fixes on nft side to reject such statements with a
proper error message.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/expr/immediate.c')
-rw-r--r-- | src/expr/immediate.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/expr/immediate.c b/src/expr/immediate.c index 5d477a8..f56aa8f 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -36,9 +36,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type, memcpy(&imm->dreg, data, sizeof(imm->dreg)); break; case NFTNL_EXPR_IMM_DATA: - memcpy(&imm->data.val, data, data_len); - imm->data.len = data_len; - break; + return nftnl_data_cpy(&imm->data, data, data_len); case NFTNL_EXPR_IMM_VERDICT: memcpy(&imm->data.verdict, data, sizeof(imm->data.verdict)); break; |