a2ea441692
- Install an improved sample config - Fix permissions of osf-related configs - rule: Fix for potential off-by-one in cmd_add_loc() - netlink_delinearize: Fix suspicious calloc() call - netlink: Avoid memleak in error path of netlink_delinearize_obj() - netlink: Avoid memleak in error path of netlink_delinearize_table() - netlink: Avoid memleak in error path of netlink_delinearize_chain() - netlink: Avoid memleak in error path of netlink_delinearize_set() - json: Drop pointless assignment in exthdr_expr_json() - evaluate: Mark fall through case in str2hooknum() - parser_json: Fix for memleak in tcp option error path - parser_bison: Fix for implicit declaration of isalnum - main: fix nft --help output fallout from 719e4427 - tests: add icmp/6 test where dependency should be left alone - payload: check icmp dependency before removing previous icmp expression Resolves: rhbz#1933117, rhbz#1938823, rhbz#1931790, rhbz#1964987, rhbz#1971600
31 lines
927 B
Diff
31 lines
927 B
Diff
From 07ebd0fa9300176f818789fde2498422fa421090 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Fri, 11 Jun 2021 16:19:18 +0200
|
|
Subject: [PATCH] evaluate: Mark fall through case in str2hooknum()
|
|
|
|
It is certainly intentional, so just mark it as such.
|
|
|
|
Fixes: b4775dec9f80b ("src: ingress inet support")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit c2e06beef3390867901080c0d789e3b6257e2b98)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/evaluate.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/evaluate.c b/src/evaluate.c
|
|
index c830dcdbd9651..2a897f469434a 100644
|
|
--- a/src/evaluate.c
|
|
+++ b/src/evaluate.c
|
|
@@ -4030,6 +4030,7 @@ static uint32_t str2hooknum(uint32_t family, const char *hook)
|
|
case NFPROTO_INET:
|
|
if (!strcmp(hook, "ingress"))
|
|
return NF_INET_INGRESS;
|
|
+ /* fall through */
|
|
case NFPROTO_IPV4:
|
|
case NFPROTO_BRIDGE:
|
|
case NFPROTO_IPV6:
|
|
--
|
|
2.31.1
|
|
|