]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
netprio_cgroup: limit the maximum css->id to USHRT_MAX
authorTejun Heo <tj@kernel.org>
Mon, 7 Dec 2015 22:38:51 +0000 (17:38 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2015 03:02:33 +0000 (22:02 -0500)
commit297dbde19cf6a0ccb6fd4396c6220a5912ed61e8
treed1b65de60b8d8adfd2f84542cd59d9ed61f12c6b
parentbc9b145a092aca91a7f6ef40cdb3628b6ada7ec9
netprio_cgroup: limit the maximum css->id to USHRT_MAX

netprio builds per-netdev contiguous priomap array which is indexed by
css->id.  The array is allocated using kzalloc() effectively limiting
the maximum ID supported to some thousand range.  This patch caps the
maximum supported css->id to USHRT_MAX which should be way above what
is actually useable.

This allows reducing sock->sk_cgrp_prioidx to u16 from u32.  The freed
up part will be used to overload the cgroup related fields.
sock->sk_cgrp_prioidx's position is swapped with sk_mark so that the
two cgroup related fields are adjacent.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Daniel Borkmann <daniel@iogearbox.net>
CC: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/sock.h
net/core/netprio_cgroup.c