summaryrefslogtreecommitdiffstats
path: root/src/expr/data_reg.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2023-12-12 15:01:17 +0100
committerFlorian Westphal <fw@strlen.de>2023-12-12 16:11:15 +0100
commitbc2afbde9eae491bcef23ef5b24b25c7605ad911 (patch)
treebecc43a77fdf77975b5cfa3f61de8dea7cf4ee7c /src/expr/data_reg.c
parentff117f50d2f99c03a65b4952b1a6988a8adc700f (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/data_reg.c')
-rw-r--r--src/expr/data_reg.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index 2633a77..690b23d 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -217,3 +217,17 @@ void nftnl_free_verdict(const union nftnl_data_reg *data)
break;
}
}
+
+int nftnl_data_cpy(union nftnl_data_reg *dreg, const void *src, uint32_t len)
+{
+ int ret = 0;
+
+ if (len > sizeof(dreg->val)) {
+ len = sizeof(dreg->val);
+ ret = -1;
+ }
+
+ memcpy(dreg->val, src, len);
+ dreg->len = len;
+ return ret;
+}