Commit e6e00017 authored Oct 07, 2018 by Taehee Yoo Committed by Greg Kroah-Hartman Mar 13, 2019

netfilter: xt_TEE: add missing code to get interface index in checkentry.



[ Upstream commit 18c0ab87364ac5128a152055fdcb1d27e01caf01 ]

checkentry(tee_tg_check) should initialize priv->oif from dev if possible.
But only netdevice notifier handler can set that.
Hence priv->oif is always -1 until notifier handler is called.

Fixes: 9e2f6c5d ("netfilter: Rework xt_TEE netdevice notifier")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 02d86085

net/netfilter/xt_TEE.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,8 @@ static int tee_tg_check(const struct xt_tgchk_param *par)
		return -EINVAL;

		if (info->oif[0]) {
		struct net_device *dev;

		if (info->oif[sizeof(info->oif)-1] != '\0')
		return -EINVAL;

		@@ -115,6 +117,11 @@ static int tee_tg_check(const struct xt_tgchk_param *par)
		priv->oif = -1;
		info->priv = priv;

		dev = dev_get_by_name(par->net, info->oif);
		if (dev) {
		priv->oif = dev->ifindex;
		dev_put(dev);
		}
		mutex_lock(&tn->lock);
		list_add(&priv->list, &tn->priv_list);
		mutex_unlock(&tn->lock);