netfilter: x_tables: Use unsafe_memcpy() for 0-sized destination
Subsystems (3)
PATCH 1/1 netfilter: x_tables: Use unsafe_memcpy() for 0-sized destination
The struct xt_entry_target fake flexible array has not be converted to a true flexible array, which is mainly blocked by it being both UAPI and used in the middle of other structures. In order to properly check for 0-sized destinations in memcpy(), an exception must be made for the one place where it is still a destination. Since memcpy() was already skipping checks for 0-sized destinations, using unsafe_memcpy() is no change in behavior.
---
Cc: Pablo Neira Ayuso <[email protected]>
Cc: Jozsef Kadlecsik <[email protected]>
Cc: Florian Westphal <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Paolo Abeni <[email protected]>
Cc: Gustavo A. R. Silva <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
--- net/netfilter/x_tables.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/x_tables.c +2 -1
@@ -1142,7 +1142,8 @@ void xt_compat_target_from_user(struct xt_entry_target *t, void **dstptr,if (target->compat_from_user) target->compat_from_user (t->data, ct->data);else -memcpy (t->data, ct->data, tsize -sizeof (*ct)); +unsafe_memcpy (t->data, ct->data, tsize -sizeof (*ct), + /* UAPI 0-sized destination */); tsize += off; t->u.user.target_size = tsize;
Signature · 1 line
2.34.1
Quoted 9 lines · Kees Cook
The struct
xt_entry_targetfake flexible array has not be converted to a true flexible array, which is mainly blocked by it being both UAPI and used in the middle of other structures. In order to properly check for 0-sized destinations inmemcpy(), an exception must be made for the one place where it is still a destination. Sincememcpy()was already skipping checks for 0-sized destinations, usingunsafe_memcpy()is no change in behavior.Signed-off-by Kees Cook <[email protected]>