From: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
To: pablo@netfilter.org, netfilter-devel@vger.kernel.org,
gregkh@linuxfoundation.org
Cc: Taehee Yoo <ap420073@gmail.com>
Subject: [PATCH 4.19 2/2] netfilter: xt_TEE: add missing code to get interface index in checkentry.
Date: Fri, 8 Mar 2019 16:38:14 -0700 [thread overview]
Message-ID: <1552088294-18087-2-git-send-email-subashab@codeaurora.org> (raw)
In-Reply-To: <1552088294-18087-1-git-send-email-subashab@codeaurora.org>
From: Taehee Yoo <ap420073@gmail.com>
commit 18c0ab87364ac5128a152055fdcb1d27e01caf01 upstream.
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: 9e2f6c5d78db ("netfilter: Rework xt_TEE netdevice notifier")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_TEE.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index 673ad20..1dae02a 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -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);
--
1.9.1
next prev parent reply other threads:[~2019-03-08 23:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-08 23:38 [PATCH 4.19 1/2] netfilter: xt_TEE: fix wrong interface selection Subash Abhinov Kasiviswanathan
2019-03-08 23:38 ` Subash Abhinov Kasiviswanathan [this message]
2019-03-11 12:31 ` [PATCH 4.19 2/2] netfilter: xt_TEE: add missing code to get interface index in checkentry Pablo Neira Ayuso
2019-03-12 0:40 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1552088294-18087-2-git-send-email-subashab@codeaurora.org \
--to=subashab@codeaurora.org \
--cc=ap420073@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.