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
963 B
Diff
31 lines
963 B
Diff
From a7da4f45cc1c8419b38e3e9adf0e15bedb8b0257 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Fri, 11 Jun 2021 16:23:22 +0200
|
|
Subject: [PATCH] json: Drop pointless assignment in exthdr_expr_json()
|
|
|
|
The updated value of 'is_exists' is no longer read at this point.
|
|
|
|
Fixes: cb21869649208 ("json: tcp: add raw tcp option match support")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
(cherry picked from commit c1616dfd1ce40bac197924c8947e1c646e915dca)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/json.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/src/json.c b/src/json.c
|
|
index 585d35326ac01..1fb5015124e16 100644
|
|
--- a/src/json.c
|
|
+++ b/src/json.c
|
|
@@ -692,7 +692,6 @@ json_t *exthdr_expr_json(const struct expr *expr, struct output_ctx *octx)
|
|
"base", expr->exthdr.raw_type,
|
|
"offset", expr->exthdr.offset,
|
|
"len", expr->len);
|
|
- is_exists = false;
|
|
}
|
|
|
|
return json_pack("{s:o}", "tcp option", root);
|
|
--
|
|
2.31.1
|
|
|