You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
892 B
Diff
31 lines
892 B
Diff
From: Hangbin Liu <liuhangbin@gmail.com>
|
|
Date: Mon, 25 Dec 2017 11:34:54 +0800
|
|
Subject: [PATCH] netfilter: nf_tables: fix potential NULL-ptr deref in
|
|
nf_tables_dump_obj_done()
|
|
|
|
If there is no NFTA_OBJ_TABLE and NFTA_OBJ_TYPE, the c.data will be NULL in
|
|
nf_tables_getobj(). So before free filter->table in nf_tables_dump_obj_done(),
|
|
we need to check if filter is NULL first.
|
|
|
|
Fixes: e46abbcc05aa ("netfilter: nf_tables: Allow table names of up to 255 chars")
|
|
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
|
|
Acked-by: Phil Sutter <phil@nwl.cc>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
---
|
|
|
|
--- a/net/netfilter/nf_tables_api.c
|
|
+++ b/net/netfilter/nf_tables_api.c
|
|
@@ -5357,8 +5357,10 @@ static int nf_tables_dump_flowtable_done
|
|
if (!filter)
|
|
return 0;
|
|
|
|
- kfree(filter->table);
|
|
- kfree(filter);
|
|
+ if (filter) {
|
|
+ kfree(filter->table);
|
|
+ kfree(filter);
|
|
+ }
|
|
|
|
return 0;
|
|
}
|