From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: Michal Kubecek <mkubecek@suse.cz>
Cc: Florian Westphal <fw@strlen.de>,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
linux-api@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pablo Neira Ayuso <pablo@netfilter.org>,
Patrick McHardy <kaber@trash.net>,
Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [PATCH nf-next] netfilter: nf_ct_sctp: minimal multihoming support
Date: Wed, 15 Jul 2015 17:35:08 -0300 [thread overview]
Message-ID: <20150715203508.GA14704@localhost.localdomain> (raw)
In-Reply-To: <20150714164225.GB8478@unicorn.suse.cz>
Hi,
On Tue, Jul 14, 2015 at 06:42:25PM +0200, Michal Kubecek wrote:
> On Tue, Jul 14, 2015 at 03:42:03PM +0200, Florian Westphal wrote:
> > Michal Kubecek <mkubecek@suse.cz> wrote:
> > > + case SCTP_CID_HEARTBEAT:
> > > + pr_debug("SCTP_CID_HEARTBEAT");
> > > + i = 9;
> > > + break;
> > > + case SCTP_CID_HEARTBEAT_ACK:
> > > + pr_debug("SCTP_CID_HEARTBEAT_ACK");
> > > + i = 10;
> > > + break;
> > > default:
> > > /* Other chunks like DATA, SACK, HEARTBEAT and
> > > its ACK do not cause a change in state */
> > > @@ -329,6 +351,8 @@ static int sctp_packet(struct nf_conn *ct,
> > > !test_bit(SCTP_CID_COOKIE_ECHO, map) &&
> > > !test_bit(SCTP_CID_ABORT, map) &&
> > > !test_bit(SCTP_CID_SHUTDOWN_ACK, map) &&
> > > + !test_bit(SCTP_CID_HEARTBEAT, map) &&
> > > + !test_bit(SCTP_CID_HEARTBEAT_ACK, map) &&
> > > sh->vtag != ct->proto.sctp.vtag[dir]) {
> > > pr_debug("Verification tag check failed\n");
> > > goto out;
> > > @@ -357,6 +381,16 @@ static int sctp_packet(struct nf_conn *ct,
> > > /* Sec 8.5.1 (D) */
> > > if (sh->vtag != ct->proto.sctp.vtag[dir])
> > > goto out_unlock;
> > > + } else if (sch->type == SCTP_CID_HEARTBEAT ||
> > > + sch->type == SCTP_CID_HEARTBEAT_ACK) {
> > > + if (ct->proto.sctp.vtag[dir] == 0) {
> > > + pr_debug("Setting vtag %x for dir %d\n",
> > > + sh->vtag, dir);
> > > + ct->proto.sctp.vtag[dir] = sh->vtag;
> >
> > Could you please elaborate on the [dir] == 0 test?
> >
> > I see this might happen for SCTP_CID_HEARTBEAT_ACK, but why is this
> > needed for SCTP_CID_HEARTBEAT ?
> >
> > We found a conntrack entry so shouldn't the vtag[dir] already be > 0?
>
> Yes, you are right. This was originally intended to handle the case when
> a HEARTBEAT in the reply direction is seen before the HEARTBEAT-ACK but
> such HEARTBEAT would be dropped anyway in current version.
And we have to keep the first vtag attempted because otherwise an
attacker could just probe for the right one until she gets a reply.
IOW, if a different vtag is attempted, we should drop it as the packet
doesn't belong to that association/conntrack entry.
As vtags are always != 0 in such case, that's a way to know if we
already have that information or not.
> On the other hand, an alternative would be
>
> } else if (sch->type == SCTP_CID_HEARTBEAT_ACK &&
> ct->proto.sctp.vtag[dir] == 0) {
> pr_debug("Setting vtag %x for dir %d\n",
> sh->vtag, dir);
> ct->proto.sctp.vtag[dir] = sh->vtag;
> } else if ((sch->type == SCTP_CID_HEARTBEAT ||
> sch->type == SCTP_CID_HEARTBEAT_ACK) &&
> sh->vtag != ct->proto.sctp.vtag[dir]) {
> pr_debug("Verification tag check failed\n");
> goto out_unlock;
> }
>
> I'm not sure it looks better.
Now it seems swapped, we should save the tag on HB and check on
HB_ACK only and would have to check against !dir entry. Like:
comments with // here are just informative on this email and may not
necessary in the code
} else if (sch->type == SCTP_CID_HEARTBEAT)
if (!sh->vtag || sh->vtag != ct->proto.sctp.vtag[!dir]) {
/* Invalid */
goto out_unlock;
}
else if (!ct->proto.sctp.vtag[!dir]) {
pr_debug("Setting vtag %x for dir %d\n",
sh->vtag, dir);
// by saving it on !dir direction, we
// don't have to enable HB_ACK on that
// if() above of exceptions, just HB
// itself
ct->proto.sctp.vtag[!dir] = sh->vtag;
}
// fallthrough: no action because it's a vtag we
// have already seen
} else if (sch->type == SCTP_CID_HEARTBEAT_ACK) {
// it's guaranteed tht sh->vtag == ct->proto.sctp.vtag[dir]
// by the if() of the exceptions above, so we
// just have to check for vtag == 0
if (!sh->vtag) {
pr_debug("Verification tag check failed\n");
goto out_unlock;
}
// ok, it's hand-shaked, now save it on the
// other direction too so that further packets
// can pass that check
// if there was a vtag crossed some when, we
// don't care as this one is now established.
ct->proto.sctp.vtag[dir] = sh->vtag;
}
I was also working on such implementation. Please give me some time to
map one thing to another.
Marcelo
next prev parent reply other threads:[~2015-07-15 20:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 12:23 [PATCH nf-next] netfilter: nf_ct_sctp: minimal multihoming support Michal Kubecek
[not found] ` <20150714122311.8DA8EA0C9A-OEaqT8BN2ewCVLCxKZUutA@public.gmane.org>
2015-07-14 13:42 ` Florian Westphal
2015-07-14 16:42 ` Michal Kubecek
2015-07-15 20:35 ` Marcelo Ricardo Leitner [this message]
2015-07-16 12:05 ` Michal Kubecek
[not found] ` <20150716120512.GA7200-OEaqT8BN2ewCVLCxKZUutA@public.gmane.org>
2015-07-16 13:18 ` Marcelo Ricardo Leitner
2015-07-14 15:38 ` Pablo Neira Ayuso
2015-07-14 16:28 ` Michal Kubecek
[not found] ` <20150714162850.GA8478-OEaqT8BN2ewCVLCxKZUutA@public.gmane.org>
2015-07-15 16:45 ` Pablo Neira Ayuso
2015-07-16 13:50 ` Marcelo Ricardo Leitner
[not found] ` <20150716135059.GB14704-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2015-07-16 16:13 ` Michal Kubecek
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=20150715203508.GA14704@localhost.localdomain \
--to=marcelo.leitner@gmail.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kaber@trash.net \
--cc=kadlec@blackhole.kfki.hu \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.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 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).