From: Zhouyi Zhou <zhouzhouyi@gmail.com>
To: <pablo@netfilter.org>, <kaber@trash.net>,
<kadlec@blackhole.kfki.hu>, <davem@davemloft.net>,
<netfilter-devel@vger.kernel.org>, <coreteam@netfilter.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: Zhouyi Zhou <yizhouzhou@ict.ac.cn>, Zhouyi Zhou <zhouzhouyi@gmail.com>
Subject: [PATCH 1/1] netfilter: h323: avoid potential attack
Date: Wed, 27 Jan 2016 22:40:45 +0800 [thread overview]
Message-ID: <1453905646-6446-1-git-send-email-zhouzhouyi@gmail.com> (raw)
From: Zhouyi Zhou <yizhouzhou@ict.ac.cn>
I think hackers chould build a malicious h323 packet to overflow
the pointer p which will panic during the memcpy(addr, p, len)
For example, he may fabricate a very large taddr->ipAddress.ip;
Signed-off-by: Zhouyi Zhou <zhouzhouyi@gmail.com>
---
net/netfilter/nf_conntrack_h323_main.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 9511af0..3b3dd8c 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -110,6 +110,10 @@ int (*nat_q931_hook) (struct sk_buff *skb,
static DEFINE_SPINLOCK(nf_h323_lock);
static char *h323_buffer;
+#define CHECK_BOUND(p, n) do { \
+ if (((p - h323_buffer) + n) > 65536) \
+ return 0; \
+} while (0)
static struct nf_conntrack_helper nf_conntrack_helper_h245;
static struct nf_conntrack_helper nf_conntrack_helper_q931[];
@@ -247,6 +251,8 @@ static int get_h245_addr(struct nf_conn *ct, const unsigned char *data,
return 0;
}
+ CHECK_BOUND(p, len);
+
memcpy(addr, p, len);
memset((void *)addr + len, 0, sizeof(*addr) - len);
memcpy(port, p + len, sizeof(__be16));
@@ -669,6 +675,8 @@ int get_h225_addr(struct nf_conn *ct, unsigned char *data,
return 0;
}
+ CHECK_BOUND(p, len);
+
memcpy(addr, p, len);
memset((void *)addr + len, 0, sizeof(*addr) - len);
memcpy(port, p + len, sizeof(__be16));
--
1.7.10.4
next reply other threads:[~2016-01-27 14:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-27 14:40 Zhouyi Zhou [this message]
2016-01-27 15:06 ` [PATCH 1/1] netfilter: h323: avoid potential attack kbuild test robot
2016-01-27 15:57 ` Eric Dumazet
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=1453905646-6446-1-git-send-email-zhouzhouyi@gmail.com \
--to=zhouzhouyi@gmail.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=yizhouzhou@ict.ac.cn \
/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).