From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 6/7] netfilter: nf_tables: validate NFTA_SET_TABLE parameter
Date: Wed, 1 Jun 2016 14:03:23 +0200 [thread overview]
Message-ID: <1464782604-19346-7-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1464782604-19346-1-git-send-email-pablo@netfilter.org>
From: Phil Turnbull <phil.turnbull@oracle.com>
If the NFTA_SET_TABLE parameter is missing and the NLM_F_DUMP flag is
not set, then a NULL pointer dereference is triggered in
nf_tables_set_lookup because ctx.table is NULL.
Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_tables_api.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 2011977..6947e25 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2641,6 +2641,8 @@ static int nf_tables_getset(struct net *net, struct sock *nlsk,
/* Only accept unspec with dump */
if (nfmsg->nfgen_family == NFPROTO_UNSPEC)
return -EAFNOSUPPORT;
+ if (!nla[NFTA_SET_TABLE])
+ return -EINVAL;
set = nf_tables_set_lookup(ctx.table, nla[NFTA_SET_NAME]);
if (IS_ERR(set))
--
2.1.4
next prev parent reply other threads:[~2016-06-01 12:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-01 12:03 [PATCH 0/7] Netfilter fixes for net Pablo Neira Ayuso
2016-06-01 12:03 ` [PATCH 1/7] netfilter: nfnetlink_queue: fix timestamp attribute Pablo Neira Ayuso
2016-06-01 12:03 ` [PATCH 2/7] netfilter: conntrack: remove leftover binary sysctl define Pablo Neira Ayuso
2016-06-01 12:03 ` [PATCH 3/7] netfilter: nf_queue: Make the queue_handler pernet Pablo Neira Ayuso
2016-06-01 12:03 ` [PATCH 4/7] netfilter: nf_ct_helper: Fix helper unregister count Pablo Neira Ayuso
2016-06-01 12:03 ` [PATCH 5/7] netfilter: nf_dup_ipv6: set again FLOWI_FLAG_KNOWN_NH at flowi6_flags Pablo Neira Ayuso
2016-06-01 12:03 ` Pablo Neira Ayuso [this message]
2016-06-01 12:03 ` [PATCH 7/7] netfilter: nf_ct_helper: bail out on duplicated helpers Pablo Neira Ayuso
2016-06-02 0:54 ` [PATCH 0/7] Netfilter fixes for net David Miller
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=1464782604-19346-7-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).