diff --git a/patches.suse/netfilter-nft_set_rbtree-fix-parameter-of-__nft_rbtr.patch b/patches.suse/netfilter-nft_set_rbtree-fix-parameter-of-__nft_rbtr.patch new file mode 100644 index 0000000..e46d820 --- /dev/null +++ b/patches.suse/netfilter-nft_set_rbtree-fix-parameter-of-__nft_rbtr.patch @@ -0,0 +1,67 @@ +From 7451ca8f2d3baadf4a4999fa0ca661f389f4cb88 Mon Sep 17 00:00:00 2001 +From: Taehee Yoo +Date: Thu, 7 Jun 2018 02:05:12 +0900 +Subject: [PATCH 1/4] netfilter: nft_set_rbtree: fix parameter of + __nft_rbtree_lookup() +Git-commit: 82e20b44477ffe90a5866caa209ecc9df818c6a1 +Patch-mainline: v4.18-rc1 +References: git-fixes + +The parameter this doesn't have a flags value. so that it can't be +used by nft_rbtree_interval_end(). + +test commands: + %nft add table ip filter + %nft add set ip filter s { type ipv4_addr \; flags interval \; } + %nft add element ip filter s {0-1} + %nft add element ip filter s {2-10} + %nft add chain ip filter input { type filter hook input priority 0\; } + %nft add rule ip filter input ip saddr @s + +Splat looks like: +[ 246.752502] BUG: KASAN: slab-out-of-bounds in __nft_rbtree_lookup+0x677/0x6a0 [nft_set_rbtree] +[ 246.752502] Read of size 1 at addr ffff88010d9efa47 by task http/1092 + +[ 246.752502] CPU: 1 PID: 1092 Comm: http Not tainted 4.17.0-rc6+ #185 +[ 246.752502] Call Trace: +[ 246.752502] +[ 246.752502] dump_stack+0x74/0xbb +[ 246.752502] ? __nft_rbtree_lookup+0x677/0x6a0 [nft_set_rbtree] +[ 246.752502] print_address_description+0xc7/0x290 +[ 246.752502] ? __nft_rbtree_lookup+0x677/0x6a0 [nft_set_rbtree] +[ 246.752502] kasan_report+0x22c/0x350 +[ 246.752502] __nft_rbtree_lookup+0x677/0x6a0 [nft_set_rbtree] +[ 246.752502] nft_rbtree_lookup+0xc9/0x2d2 [nft_set_rbtree] +[ 246.752502] ? sched_clock_cpu+0x144/0x180 +[ 246.752502] nft_lookup_eval+0x149/0x3a0 [nf_tables] +[ 246.752502] ? __lock_acquire+0xcea/0x4ed0 +[ 246.752502] ? nft_lookup_init+0x6b0/0x6b0 [nf_tables] +[ 246.752502] nft_do_chain+0x263/0xf50 [nf_tables] +[ 246.752502] ? __nft_trace_packet+0x1a0/0x1a0 [nf_tables] +[ 246.752502] ? sched_clock_cpu+0x144/0x180 +[ ... ] + +Fixes: f9121355eb6f ("netfilter: nft_set_rbtree: incorrect assumption on lower interval lookups") +Signed-off-by: Taehee Yoo +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Denis Kirjanov +--- + net/netfilter/nft_set_rbtree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c +index fbdbaa00dd5f..17d0f8cd2884 100644 +--- a/net/netfilter/nft_set_rbtree.c ++++ b/net/netfilter/nft_set_rbtree.c +@@ -61,7 +61,7 @@ static bool nft_rbtree_lookup(const struct net *net, const struct nft_set *set, + parent = parent->rb_left; + if (interval && + nft_rbtree_equal(set, this, interval) && +- nft_rbtree_interval_end(this) && ++ nft_rbtree_interval_end(rbe) && + !nft_rbtree_interval_end(interval)) + continue; + interval = rbe; +-- +2.16.4 + diff --git a/series.conf b/series.conf index cee9f7d..ba2edba 100644 --- a/series.conf +++ b/series.conf @@ -35164,6 +35164,7 @@ patches.suse/0020-netfilter-nf_tables-check-msg_type-before-nft_trans_.patch patches.suse/0022-ipvs-fix-check-on-xmit-to-non-local-addresses.patch patches.suse/0023-netfilter-ebtables-reject-non-bridge-targets.patch + patches.suse/netfilter-nft_set_rbtree-fix-parameter-of-__nft_rbtr.patch patches.suse/0024-netfilter-x_tables-initialise-match-target-check-par.patch patches.suse/ixgbe-Fix-setting-of-TC-configuration-for-macvlan-ca.patch patches.suse/ixgbe-Use-CONFIG_XFRM_OFFLOAD-instead-of-CONFIG_XFRM.patch