From c485080958cdec959bea734280e7696e68586db0 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 25 Jun 2026 18:23:10 +0200 Subject: [PATCH] connmark: Fix undefined shift if traffic selector is /0 Same as the previous commit for consistency, but not an issue here as only transport mode SAs are handled. Fixes: b8973b266131 ("connmark: Add CONNMARK rules to select correct output SA based on conntrack") --- src/libcharon/plugins/connmark/connmark_listener.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcharon/plugins/connmark/connmark_listener.c b/src/libcharon/plugins/connmark/connmark_listener.c index fda440966..22d714233 100644 --- a/src/libcharon/plugins/connmark/connmark_listener.c +++ b/src/libcharon/plugins/connmark/connmark_listener.c @@ -64,7 +64,7 @@ static bool ts2in(traffic_selector_t *ts, { memcpy(&addr->s_addr, net->get_address(net).ptr, 4); net->destroy(net); - mask->s_addr = htonl(0xffffffffU << (32 - bits)); + mask->s_addr = bits ? htonl(0xffffffffU << (32 - bits)) : 0; return TRUE; } return FALSE;