Skip to contentSkip to conversation

iptables: fix memory corruption when parsing nft rules

PATCH Taedcke, Christian 2 participants 2 messages Jul 26, 2024 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Thanks for applying this fix to master.

Should i send another patch for scarthgap or is this automatically ported to scarthgap?

Regards,
Christian

Quoted 92 lines · Christian via lists.openembedded.org

From: Christian Taedcke <[email protected]>

This commit fixes a memory corruption issue when iptables (with enabled PACKAGECONFIG libnftnl) is used to access rules created by nft.

To reproduce the issue:
nft add chain ip filter TESTCHAIN { meta mark set 123 \;} iptables -t filter -n -L TESTCHAIN

This produced the following output:
Chain TESTCHAIN (0 references)
target prot opt source destination
MARK 0 -- 0.0.0.0/0 0.0.0.0/0 MARK set 0x7b
malloc(): corrupted top size
Aborted (core dumped)

This commit fixes this issue.

---
  ...se-Add-missing-braces-around-ternary.patch | 37 +++++++++++++++++++
  .../iptables/iptables_1.8.10.bb               |  1 +
  2 files changed, 38 insertions(+)

create mode 100644 meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch

meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch new file +37 -0
new file mode 100644
index 0000000000..4cbc8bdaf4
@@ -0,0 +1,37 @@
+From 2026b08bce7fe87b5964f7912e1eef30f04922c1 Mon Sep 17 00:00:00 2001
+From: Phil Sutter <[email protected]>
+Date: Fri, 26 Jan 2024 18:43:10 +0100
+Subject: [PATCH] nft: ruleparse: Add missing braces around ternary
+
+The expression evaluated the sum before the ternay, consequently not
+adding target->size if tgsize was zero.
+
+Identified by ASAN for a simple rule using standard target:
+| # ebtables -A INPUT -s de:ad:be:ef:0:00 -j RETURN
+| # ebtables -D INPUT -s de:ad:be:ef:0:00 -j RETURN
+| =================================================================
+| ==18925==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x603000000120 at pc 0x7f627a4c75c5 bp 0x7ffe882b5180 sp 0x7ffe882b4928
+| READ of size 8 at 0x603000000120 thread T0
+| [...]
+
+Upstream-Status: Backport [2026b08bce7fe87b5964f7912e1eef30f04922c1]
+
+Fixes: 2a6eee89083c8 ("nft-ruleparse: Introduce nft_create_target()")
+Signed-off-by: Phil Sutter <[email protected]>
+---
+ iptables/nft-ruleparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iptables/nft-ruleparse.c b/iptables/nft-ruleparse.c
+index 0bbdf44faf..3b1cbe4fa1 100644
+--- a/iptables/nft-ruleparse.c
++++ b/iptables/nft-ruleparse.c
+@@ -94,7 +94,7 @@ __nft_create_target(struct nft_xt_ctx *ctx, const char *name, size_t tgsize)
+ 	if (!target)
+ 		return NULL;
+
+-	size = XT_ALIGN(sizeof(*target->t)) + tgsize ?: target->size;
++	size = XT_ALIGN(sizeof(*target->t)) + (tgsize ?: target->size);
+
+ 	target->t = xtables_calloc(1, size);
+ 	target->t->u.target_size = size;
meta/recipes-extended/iptables/iptables_1.8.10.bb +1 -1
index 81eba6c967..a94e4749ae 100644
@@ -14,6 +14,7 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
             file://ip6tables.service \
             file://ip6tables.rules \
             file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \
+           file://0002-nft-ruleparse-Add-missing-braces-around-ternary.patch \
             "
  SRC_URI[sha256sum] = "5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"
 
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#202431): https://lists.openembedded.org/g/openembedded-core/message/202431
Mute This Topic: https://lists.openembedded.org/mt/107520169/7654653
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw

Hi Christian,

Taedcke, Christian via lists.openembedded.org <christian.taedcke-oss= [email protected]> escreveu (sexta, 26/07/2024 à(s) 13:45):

Quoted 5 lines

Thanks for applying this fix to master.

Should i send another patch for scarthgap or is this automatically ported to scarthgap?

You can always send the patch with:

git cherry-pick -x -s ...
git send-email --subject-prefix="OE-core][BRANCH][PATCH" ...

This makes the maintainer's life a little easier.

Jose

Quoted 113 lines

Regards,
Christian

Quoted 17 lines · Christian via lists.openembedded.org

From: Christian Taedcke <[email protected]>

This commit fixes a memory corruption issue when iptables (with enabled PACKAGECONFIG libnftnl) is used to access rules created by nft.

To reproduce the issue:
nft add chain ip filter TESTCHAIN { meta mark set 123 \;} iptables -t filter -n -L TESTCHAIN

This produced the following output:
Chain TESTCHAIN (0 references)
target prot opt source destination
MARK 0 -- 0.0.0.0/0 0.0.0.0/0 MARK set 0x7b
malloc(): corrupted top size
Aborted (core dumped)

Quoted 8 lines

This commit fixes this issue.

---
  ...se-Add-missing-braces-around-ternary.patch | 37 +++++++++++++++++++
  .../iptables/iptables_1.8.10.bb               |  1 +
  2 files changed, 38 insertions(+)

create mode 100644

meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch

Quoted 2 lines

diff --git

a/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch b/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch

Quoted 4 lines

new file mode 100644
index 0000000000..4cbc8bdaf4
--- /dev/null
+++

b/meta/recipes-extended/iptables/iptables/0002-nft-ruleparse-Add-missing-braces-around-ternary.patch

Quoted 4 lines
(quoted diff) +3 -0
@@ -0,0 +1,37 @@
+From 2026b08bce7fe87b5964f7912e1eef30f04922c1 Mon Sep 17 00:00:00 2001
+From: Phil Sutter <[email protected]>
+Date: Fri, 26 Jan 2024 18:43:10 +0100

Review line 13

Quoted 10 lines
(quoted diff) +10 -0
+Subject: [PATCH] nft: ruleparse: Add missing braces around ternary
+
+The expression evaluated the sum before the ternay, consequently not
+adding target->size if tgsize was zero.
+
+Identified by ASAN for a simple rule using standard target:
+| # ebtables -A INPUT -s de:ad:be:ef:0:00 -j RETURN
+| # ebtables -D INPUT -s de:ad:be:ef:0:00 -j RETURN
+| =================================================================
+| ==18925==ERROR: AddressSanitizer: heap-buffer-overflow on address

0x603000000120 at pc 0x7f627a4c75c5 bp 0x7ffe882b5180 sp 0x7ffe882b4928

Quoted 6 lines
(quoted diff) +6 -0
+| READ of size 8 at 0x603000000120 thread T0
+| [...]
+
+Upstream-Status: Backport [2026b08bce7fe87b5964f7912e1eef30f04922c1]
+
+Fixes: 2a6eee89083c8 ("nft-ruleparse: Introduce nft_create_target()")

Review line 29

Quoted 10 lines
(quoted diff) +10 -0
+Signed-off-by: Phil Sutter <[email protected]>
+---
+ iptables/nft-ruleparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iptables/nft-ruleparse.c b/iptables/nft-ruleparse.c
+index 0bbdf44faf..3b1cbe4fa1 100644
+--- a/iptables/nft-ruleparse.c
++++ b/iptables/nft-ruleparse.c
+@@ -94,7 +94,7 @@ __nft_create_target(struct nft_xt_ctx *ctx, const

char *name, size_t tgsize)

Review

Quoted 9 lines
(quoted diff) +8 -0
+     if (!target)
+             return NULL;
+
+-    size = XT_ALIGN(sizeof(*target->t)) + tgsize ?: target->size;
++    size = XT_ALIGN(sizeof(*target->t)) + (tgsize ?: target->size);
+
+     target->t = xtables_calloc(1, size);
+     target->t->u.target_size = size;
(quoted diff) +0 -0

b/meta/recipes-extended/iptables/iptables_1.8.10.bb

meta/recipes-extended/iptables/iptables_1.8.10.bb SRC_URI = "

Quoted 4 lines

index 81eba6c967..a94e4749ae 100644

meta/recipes-extended/iptables/iptables_1.8.10.bb +0 -0
@@ -14,6 +14,7 @@ SRC_URI = "

http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \

meta/recipes-extended/iptables/iptables_1.8.10.bb SRC_URI = " · line 16

Quoted 3 lines
meta/recipes-extended/iptables/iptables_1.8.10.bb +0 -0
             file://ip6tables.service \
             file://ip6tables.rules \
 

file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \

meta/recipes-extended/iptables/iptables_1.8.10.bb SRC_URI = " · line 17

Quoted 1 line
meta/recipes-extended/iptables/iptables_1.8.10.bb +1 -0
+

file://0002-nft-ruleparse-Add-missing-braces-around-ternary.patch \

meta/recipes-extended/iptables/iptables_1.8.10.bb SRC_URI = " · line 19

Quoted 2 lines
meta/recipes-extended/iptables/iptables_1.8.10.bb +0 -0
             "
  SRC_URI[sha256sum] =

"5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c"

Quoted 6 lines

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#202536):
https://lists.openembedded.org/g/openembedded-core/message/202536
Mute This Topic: https://lists.openembedded.org/mt/107520169/5052612
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 3 lines
Best regards,

José Quaresma