Commit e9440bf8 authored by Florian Westphal's avatar Florian Westphal Committed by Kleber Sacilotto de Souza

netfilter: x_tables: initialise match/target check parameter struct

BugLink: https://bugs.launchpad.net/bugs/1790620

commit c568503e upstream.

syzbot reports following splat:

BUG: KMSAN: uninit-value in ebt_stp_mt_check+0x24b/0x450
 net/bridge/netfilter/ebt_stp.c:162
 ebt_stp_mt_check+0x24b/0x450 net/bridge/netfilter/ebt_stp.c:162
 xt_check_match+0x1438/0x1650 net/netfilter/x_tables.c:506
 ebt_check_match net/bridge/netfilter/ebtables.c:372 [inline]
 ebt_check_entry net/bridge/netfilter/ebtables.c:702 [inline]

The uninitialised access is
   xt_mtchk_param->nft_compat

... which should be set to 0.
Fix it by zeroing the struct beforehand, same for tgchk.

ip(6)tables targetinfo uses c99-style initialiser, so no change
needed there.

Reported-by: syzbot+da4494182233c23a5fcf@syzkaller.appspotmail.com
Fixes: 55917a21 ("netfilter: x_tables: add context to know if extension runs from nft_compat")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent ecf8df94
...@@ -701,6 +701,8 @@ ebt_check_entry(struct ebt_entry *e, struct net *net, ...@@ -701,6 +701,8 @@ ebt_check_entry(struct ebt_entry *e, struct net *net,
} }
i = 0; i = 0;
memset(&mtpar, 0, sizeof(mtpar));
memset(&tgpar, 0, sizeof(tgpar));
mtpar.net = tgpar.net = net; mtpar.net = tgpar.net = net;
mtpar.table = tgpar.table = name; mtpar.table = tgpar.table = name;
mtpar.entryinfo = tgpar.entryinfo = e; mtpar.entryinfo = tgpar.entryinfo = e;
......
...@@ -673,6 +673,7 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name, ...@@ -673,6 +673,7 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name,
return -ENOMEM; return -ENOMEM;
j = 0; j = 0;
memset(&mtpar, 0, sizeof(mtpar));
mtpar.net = net; mtpar.net = net;
mtpar.table = name; mtpar.table = name;
mtpar.entryinfo = &e->ip; mtpar.entryinfo = &e->ip;
......
...@@ -686,6 +686,7 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name, ...@@ -686,6 +686,7 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name,
return -ENOMEM; return -ENOMEM;
j = 0; j = 0;
memset(&mtpar, 0, sizeof(mtpar));
mtpar.net = net; mtpar.net = net;
mtpar.table = name; mtpar.table = name;
mtpar.entryinfo = &e->ipv6; mtpar.entryinfo = &e->ipv6;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment