Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f627ed91 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_tables: check if payload length is a power of 2 



Add a check if payload's length is a power of 2 when selecting ops.
The fast ops were meant for well aligned loads, also this fixes a
small bug when using a length of 3 with some offsets which causes
only 1 byte to be loaded because the fast ops are chosen.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Acked-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 478b360a

net/netfilter/nft_payload.c

+2 −1
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ nft_payload_select_ops(const struct nft_ctx *ctx, 
	if (len == 0 || len > FIELD_SIZEOF(struct nft_data, data))

		return ERR_PTR(-EINVAL);



	if (len <= 4 && IS_ALIGNED(offset, len) && base != NFT_PAYLOAD_LL_HEADER)

	if (len <= 4 && is_power_of_2(len) && IS_ALIGNED(offset, len) &&

	    base != NFT_PAYLOAD_LL_HEADER)

		return &nft_payload_fast_ops;

	else

		return &nft_payload_ops;