From: Patrick McHardy <kaber@trash.net>
To: "David S. Miller" <davem@davemloft.net>
Cc: netfilter-devel@lists.netfilter.org
Subject: [PATCH 2.4 15/18]: Backport fixes for ip6t_multiport
Date: Mon, 20 Dec 2004 08:15:29 +0100 [thread overview]
Message-ID: <41C67C11.4010006@trash.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 36 bytes --]
Backport fixes for ip6t_multiport.
[-- Attachment #2: 15.diff --]
[-- Type: text/x-patch, Size: 1742 bytes --]
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/12/05 23:32:41+01:00 yasuyuki.kozakai@toshiba.co.jp
# [NETFILTER]: Backport fixes for ip6t_multiport
#
# This patch fixes following bugs in ip6t_multiport.c,
#
# - missing check the size of the preference data.
# - IP6T_INV_PROTO should check with not ip->flags but ip->invflags.
#
# Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
# net/ipv6/netfilter/ip6t_multiport.c
# 2004/12/05 23:32:39+01:00 yasuyuki.kozakai@toshiba.co.jp +4 -1
# [NETFILTER]: Backport fixes for ip6t_multiport
#
# This patch fixes following bugs in ip6t_multiport.c,
#
# - missing check the size of the preference data.
# - IP6T_INV_PROTO should check with not ip->flags but ip->invflags.
#
# Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
# Signed-off-by: Patrick McHardy <kaber@trash.net>
#
diff -Nru a/net/ipv6/netfilter/ip6t_multiport.c b/net/ipv6/netfilter/ip6t_multiport.c
--- a/net/ipv6/netfilter/ip6t_multiport.c 2004-12-20 07:01:28 +01:00
+++ b/net/ipv6/netfilter/ip6t_multiport.c 2004-12-20 07:01:28 +01:00
@@ -74,9 +74,12 @@
{
const struct ip6t_multiport *multiinfo = matchinfo;
+ if (matchsize != IP6T_ALIGN(sizeof(struct ip6t_multiport)))
+ return 0;
+
/* Must specify proto == TCP/UDP, no unknown flags or bad count */
return (ip->proto == IPPROTO_TCP || ip->proto == IPPROTO_UDP)
- && !(ip->flags & IP6T_INV_PROTO)
+ && !(ip->invflags & IP6T_INV_PROTO)
&& matchsize == IP6T_ALIGN(sizeof(struct ip6t_multiport))
&& (multiinfo->flags == IP6T_MULTIPORT_SOURCE
|| multiinfo->flags == IP6T_MULTIPORT_DESTINATION
reply other threads:[~2004-12-20 7:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=41C67C11.4010006@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@lists.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.