OSDN Git Service

inet_diag: return classid for all socket types
authorDmitry Yakunin <zeil@yandex-team.ru>
Thu, 5 Mar 2020 12:33:12 +0000 (15:33 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Mar 2020 04:57:48 +0000 (21:57 -0700)
commit83f73c5bb7b9a9135173f0ba2b1aa00c06664ff9
tree39c21636cd4bb6e1b44bab7034c030d9c3705195
parentb723bd933980f4956dabc8a8d84b3e83be8d094c
inet_diag: return classid for all socket types

In commit 1ec17dbd90f8 ("inet_diag: fix reporting cgroup classid and
fallback to priority") croup classid reporting was fixed. But this works
only for TCP sockets because for other socket types icsk parameter can
be NULL and classid code path is skipped. This change moves classid
handling to inet_diag_msg_attrs_fill() function.

Also inet_diag_msg_attrs_size() helper was added and addends in
nlmsg_new() were reordered to save order from inet_sk_diag_fill().

Fixes: 1ec17dbd90f8 ("inet_diag: fix reporting cgroup classid and fallback to priority")
Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru>
Reviewed-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/inet_diag.h
net/ipv4/inet_diag.c
net/ipv4/raw_diag.c
net/ipv4/udp_diag.c
net/sctp/diag.c