Skip to content

Commit 6eef7a2

Browse files
FlorentRevestummakynes
authored andcommitted
netfilter: conntrack: Avoid nf_ct_helper_hash uses after free
If nf_conntrack_init_start() fails (for example due to a register_nf_conntrack_bpf() failure), the nf_conntrack_helper_fini() clean-up path frees the nf_ct_helper_hash map. When built with NF_CONNTRACK=y, further netfilter modules (e.g: netfilter_conntrack_ftp) can still be loaded and call nf_conntrack_helpers_register(), independently of whether nf_conntrack initialized correctly. This accesses the nf_ct_helper_hash dangling pointer and causes a uaf, possibly leading to random memory corruption. This patch guards nf_conntrack_helper_register() from accessing a freed or uninitialized nf_ct_helper_hash pointer and fixes possible uses-after-free when loading a conntrack module. Cc: [email protected] Fixes: 12f7a50 ("netfilter: add user-space connection tracking helper infrastructure") Signed-off-by: Florent Revest <[email protected]> Reviewed-by: Florian Westphal <[email protected]> Signed-off-by: Pablo Neira Ayuso <[email protected]>
1 parent 8a9dc07 commit 6eef7a2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

net/netfilter/nf_conntrack_helper.c

+4
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ int nf_conntrack_helper_register(struct nf_conntrack_helper *me)
360360
BUG_ON(me->expect_class_max >= NF_CT_MAX_EXPECT_CLASSES);
361361
BUG_ON(strlen(me->name) > NF_CT_HELPER_NAME_LEN - 1);
362362

363+
if (!nf_ct_helper_hash)
364+
return -ENOENT;
365+
363366
if (me->expect_policy->max_expected > NF_CT_EXPECT_MAX_CNT)
364367
return -EINVAL;
365368

@@ -515,4 +518,5 @@ int nf_conntrack_helper_init(void)
515518
void nf_conntrack_helper_fini(void)
516519
{
517520
kvfree(nf_ct_helper_hash);
521+
nf_ct_helper_hash = NULL;
518522
}

0 commit comments

Comments
 (0)