Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8ddc916 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

netfilter: ipt_recent: fix race between recent_mt_destroy and proc manipulations 



The thing is that recent_mt_destroy first flushes the entries
from table with the recent_table_flush and only *after* this
removes the proc file, corresponding to that table.

Thus, if we manage to write to this file the '+XXX' command we
will leak some entries. If we manage to write there a 'clean'
command we'll race in two recent_table_flush flows, since the
recent_mt_destroy calls this outside the recent_lock.

The proper solution as I see it is to remove the proc file first
and then go on with flushing the table. This flushing becomes
safe w/o the lock, since the table is already inaccessible from
the outside.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae375044

net/ipv4/netfilter/ipt_recent.c

+1 −1
Original line number Diff line number Diff line
@@ -305,10 +305,10 @@ static void recent_mt_destroy(const struct xt_match *match, void *matchinfo) 
		spin_lock_bh(&recent_lock);

		list_del(&t->list);

		spin_unlock_bh(&recent_lock);

		recent_table_flush(t);

#ifdef CONFIG_PROC_FS

		remove_proc_entry(t->name, proc_dir);

#endif

		recent_table_flush(t);

		kfree(t);

	}

	mutex_unlock(&recent_mutex);