nftables/backport-netlink_linearize-use-div_round_up-in-byteorder-length.patch
zhanghao 21b20ead7d netlink_linearize: use div_round_up in byteorder length
(cherry picked from commit 07b379a5b35e4281e548c2ef5f83762f5f7766bb)
2023-08-15 09:17:57 +08:00

32 lines
1.2 KiB
Diff

From 25e7b99cc450490c38becb03d8bddd0199cfd3f9 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 6 Jul 2023 10:26:39 +0200
Subject: netlink_linearize: use div_round_up in byteorder length
Use div_round_up() to calculate the byteorder length, otherwise fields
that take % BITS_PER_BYTE != 0 are not considered by the byteorder
expression.
Reported-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/netlink_linearize.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index 92f7e8e..237fb6d 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -737,7 +737,7 @@ static void netlink_gen_unary(struct netlink_linearize_ctx *ctx,
netlink_put_register(nle, NFTNL_EXPR_BYTEORDER_SREG, dreg);
netlink_put_register(nle, NFTNL_EXPR_BYTEORDER_DREG, dreg);
nftnl_expr_set_u32(nle, NFTNL_EXPR_BYTEORDER_LEN,
- expr->len / BITS_PER_BYTE);
+ div_round_up(expr->len, BITS_PER_BYTE));
nftnl_expr_set_u32(nle, NFTNL_EXPR_BYTEORDER_SIZE,
byte_size);
nftnl_expr_set_u32(nle, NFTNL_EXPR_BYTEORDER_OP,
--
2.33.0