leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: x_tables: don't return garbage pointer on modprobe failure

Browse Source 
request_module may return a positive error result from modprobe,
if we cast this to ERR_PTR this returns a garbage result (it passes
IS_ERR checks).

Fix it by ignoring modprobe return values entirely, just retry the
table lookup instead.

Reported-by: syzbot+980925dbfbc7f93bc2ef@syzkaller.appspotmail.com
Fixes: 03d13b6868 ("netfilter: xtables: add and use xt_request_find_table_lock")
Fixes: 20651cefd2 ("netfilter: x_tables: unbreak module auto loading")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2018-01-13 14:06:08 +01:00 committed by Pablo Neira Ayuso
parent 9be9d04b28
commit e3eeacbac4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/x_tables.c
View File

@ -1085,7 +1085,7 @@ struct xt_table *xt_request_find_table_lock(struct net *net, u_int8_t af,
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
if (IS_ERR(t)) { if (IS_ERR(t)) {
int err = request_module("%stable_%s", xt_prefix[af], name); int err = request_module("%stable_%s", xt_prefix[af], name);
if (err) if (err < 0)
return ERR_PTR(err); return ERR_PTR(err);
t = xt_find_table_lock(net, af, name); t = xt_find_table_lock(net, af, name);
} }