netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Borkmann <daniel@iogearbox.net>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: daniel@zonque.org, fw@strlen.de, a.perevalov@samsung.com,
	netfilter-devel@vger.kernel.org
Subject: Re: [PATCH nf-next 2/2] netfilter: x_tables: fix cgroup's NF_INET_LOCAL_IN sk lookups
Date: Wed, 25 Mar 2015 17:39:04 +0100	[thread overview]
Message-ID: <5512E4A8.50900@iogearbox.net> (raw)
In-Reply-To: <20150325160300.GA3722@salvia>

On 03/25/2015 05:03 PM, Pablo Neira Ayuso wrote:
> On Tue, Mar 24, 2015 at 04:30:29PM +0100, Daniel Borkmann wrote:
>> diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c
>> index 7198d66..cd2468d 100644
>> --- a/net/netfilter/xt_cgroup.c
>> +++ b/net/netfilter/xt_cgroup.c
>> @@ -16,8 +16,11 @@
>>   #include <linux/module.h>
>>   #include <linux/netfilter/x_tables.h>
>>   #include <linux/netfilter/xt_cgroup.h>
>> +
>>   #include <net/sock.h>
>>
>> +#include "xt_sk_helper.h"
>> +
>>   MODULE_LICENSE("GPL");
>>   MODULE_AUTHOR("Daniel Borkmann <dborkman@redhat.com>");
>>   MODULE_DESCRIPTION("Xtables: process control group matching");
>> @@ -34,38 +37,85 @@ static int cgroup_mt_check(const struct xt_mtchk_param *par)
>>   	return 0;
>>   }
>>
>> -static bool
>> -cgroup_mt(const struct sk_buff *skb, struct xt_action_param *par)
>> +static bool cgroup_mt(const struct sk_buff *skb,
>> +		      const struct xt_action_param *par,
>> +		      struct sock *(*cgroup_mt_slow)(const struct sk_buff *skb,
>> +						     const struct net_device *indev))
>>   {
>>   	const struct xt_cgroup_info *info = par->matchinfo;
>> +	struct sock *sk = skb->sk;
>> +	u32 sk_classid;
>> +
>> +	if (sk) {
>> +		sk_classid = sk->sk_classid;
>> +	} else {
>> +		if (par->in != NULL)
>> +			sk = cgroup_mt_slow(skb, par->in);
>
> Is this working with timewait sock?

Yes, all socket objects that are allocated (sk_alloc()) get a
sk_classid of the current task. Given that both share the same
lookup handler, we don't ignore them here as some xt_socket
flags could after the lookup optionally do.

>> +		if (sk == NULL)
>> +			return false;
>> +
>> +		sk_classid = sk->sk_classid;
>> +		sock_gen_put(sk);
>> +	}
>> +
>> +	return (info->id == sk_classid) ^ info->invert;
>> +}

  reply	other threads:[~2015-03-25 16:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-24 15:30 [PATCH nf-next 0/2] xt_cgroups fix Daniel Borkmann
2015-03-24 15:30 ` [PATCH nf-next 1/2] netfilter: x_tables: refactor lookup helpers from xt_socket Daniel Borkmann
2015-03-24 15:30 ` [PATCH nf-next 2/2] netfilter: x_tables: fix cgroup's NF_INET_LOCAL_IN sk lookups Daniel Borkmann
2015-03-25 16:03   ` Pablo Neira Ayuso
2015-03-25 16:39     ` Daniel Borkmann [this message]
2015-03-25 17:17       ` Pablo Neira Ayuso
2015-03-25 17:27         ` Daniel Borkmann
2015-03-25 20:26   ` Pablo Neira Ayuso
2015-03-25 21:34     ` Daniel Borkmann
2015-03-25 21:54       ` Daniel Mack
2015-03-24 15:42 ` [PATCH nf-next 0/2] xt_cgroups fix Florian Westphal
2015-03-24 15:58   ` Daniel Borkmann

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=5512E4A8.50900@iogearbox.net \
    --to=daniel@iogearbox.net \
    --cc=a.perevalov@samsung.com \
    --cc=daniel@zonque.org \
    --cc=fw@strlen.de \
    --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).