|
 |
4cfa1d |
From 05407602f79391e89e57ef5c4a1a0aea720855e2 Mon Sep 17 00:00:00 2001
|
|
|
4cfa1d |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4cfa1d |
Date: Tue, 21 Feb 2023 19:50:41 +0100
|
|
|
4cfa1d |
Subject: [PATCH] netlink_delinearize: Sanitize concat data element decoding
|
|
|
4cfa1d |
|
|
|
4cfa1d |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2160049
|
|
|
4cfa1d |
Upstream Status: nftables commit 1344d9e53ba4d
|
|
|
4cfa1d |
|
|
|
4cfa1d |
commit 1344d9e53ba4d67cedd13a2c76a970fc7ce65683
|
|
|
4cfa1d |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
4cfa1d |
Date: Tue Feb 21 18:36:01 2023 +0100
|
|
|
4cfa1d |
|
|
|
4cfa1d |
netlink_delinearize: Sanitize concat data element decoding
|
|
|
4cfa1d |
|
|
|
4cfa1d |
The call to netlink_get_register() might return NULL, catch this before
|
|
|
4cfa1d |
dereferencing the pointer.
|
|
|
4cfa1d |
|
|
|
4cfa1d |
Fixes: db59a5c1204c9 ("netlink_delinearize: fix decoding of concat data element")
|
|
|
4cfa1d |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
4cfa1d |
Acked-by: Florian Westphal <fw@strlen.de>
|
|
|
4cfa1d |
|
|
|
4cfa1d |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
4cfa1d |
---
|
|
|
4cfa1d |
src/netlink_delinearize.c | 2 +-
|
|
|
4cfa1d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4cfa1d |
|
|
|
4cfa1d |
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
|
|
|
4cfa1d |
index e9e0845..cadb8ec 100644
|
|
|
4cfa1d |
--- a/src/netlink_delinearize.c
|
|
|
4cfa1d |
+++ b/src/netlink_delinearize.c
|
|
|
4cfa1d |
@@ -1660,7 +1660,7 @@ static void netlink_parse_dynset(struct netlink_parse_ctx *ctx,
|
|
|
4cfa1d |
sreg_data = netlink_parse_register(nle, NFTNL_EXPR_DYNSET_SREG_DATA);
|
|
|
4cfa1d |
expr_data = netlink_get_register(ctx, loc, sreg_data);
|
|
|
4cfa1d |
|
|
|
4cfa1d |
- if (expr_data->len < set->data->len) {
|
|
|
4cfa1d |
+ if (expr_data && expr_data->len < set->data->len) {
|
|
|
4cfa1d |
expr_free(expr_data);
|
|
|
4cfa1d |
expr_data = netlink_parse_concat_expr(ctx, loc, sreg_data, set->data->len);
|
|
|
4cfa1d |
if (expr_data == NULL)
|
|
|
4cfa1d |
--
|
|
|
4cfa1d |
2.39.2
|
|
|
4cfa1d |
|