diff options
| author |   Tejun Heo <tj@kernel.org> | 2015-12-07 17:38:52 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-08 22:02:33 -0500 |
| commit | 2a56a1fec290bf0bc4676bbf4efdb3744953a3e7 (patch) | |
| tree | c02ca93b96c4fa2c8aacf24f72f63d861794e567 /net/netfilter/xt_cgroup.c | |
| parent | netprio_cgroup: limit the maximum css->id to USHRT_MAX (diff) | |
| download | linux-dev-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.tar.xz linux-dev-2a56a1fec290bf0bc4676bbf4efdb3744953a3e7.zip | |
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
Introduce sock->sk_cgrp_data which is a struct sock_cgroup_data.
->sk_cgroup_prioidx and ->sk_classid are moved into it. The struct
and its accessors are defined in cgroup-defs.h. This is to prepare
for overloading the fields with a cgroup pointer.
This patch mostly performs equivalent conversions but the followings
are noteworthy.
* Equality test before updating classid is removed from
sock_update_classid(). This shouldn't make any noticeable
difference and a similar test will be implemented on the helper side
later.
* sock_update_netprioidx() now takes struct sock_cgroup_data and can
be moved to netprio_cgroup.h without causing include dependency
loop. Moved.
* The dummy version of sock_update_netprioidx() converted to a static
inline function while at it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/xt_cgroup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/xt_cgroup.c b/net/netfilter/xt_cgroup.c index a1d126f29463..54eaeb45ce99 100644 --- a/net/netfilter/xt_cgroup.c +++ b/net/netfilter/xt_cgroup.c @@ -42,7 +42,8 @@ cgroup_mt(const struct sk_buff *skb, struct xt_action_param *par) if (skb->sk == NULL || !sk_fullsock(skb->sk)) return false; - return (info->id == skb->sk->sk_classid) ^ info->invert; + return (info->id == sock_cgroup_classid(&skb->sk->sk_cgrp_data)) ^ + info->invert; } static struct xt_match cgroup_mt_reg __read_mostly = { |