In criu we are actively using diag interface to collect sockets present in the system when dumping applications. And while for unix, tcp, udp[lite], packet, netlink it works as expected, the raw sockets do not have. Thus add it. v2: - add missing sock_put calls in raw_diag_dump_one (by eric.dumazet@) - implement @destroy for diag requests (by dsa@) v3: - add export of raw_abort for IPv6 (by dsa@) - pass net-admin flag into inet_sk_diag_fill due to changes in net-next branch (by dsa@) v4: - use @pad in struct inet_diag_req_v2 for raw socket protocol specification: raw module carries sockets which may have custom protocol passed from socket() syscall and sole @sdiag_protocol is not enough to match underlied ones - start reporting protocol specifed in socket() call when sockets are raw ones for the same reason: user space tools like ss may parse this attribute and use it for socket matching v5 (by eric.dumazet@): - use sock_hold in raw_sock_get instead of atomic_inc, we're holding (raw_v4_hashinfo|raw_v6_hashinfo)->lock when looking up so counter won't be zero here. v6: - use sdiag_raw_protocol() helper which will access @pad structure used for raw sockets protocol specification: we can't simply rename this member without breaking uapi v7: - sine sdiag_raw_protocol() helper is not suitable for uapi lets rather make an alias structure with proper names. __check_inet_diag_req_raw helper will catch if any of structure unintentionally changed.
Showing the changes to include/uapi/linux (1 of 9 files). Show all
Unified · Split
| @@ -43,6 +43,23 @@ struct inet_diag_req_v2 { · 42 unmodified lines | |||
| 43 | struct inet_diag_sockid id; | 43 | struct inet_diag_sockid id; |
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | /* | ||
| 47 | * SOCK_RAW sockets require the underlied protocol to be | ||
| 48 | * additionally specified so we can use @pad member for | ||
| 49 | * this, but we can't rename it because userspace programs | ||
| 50 | * still may depend on this name. Instead lets use another | ||
| 51 | * structure definition as an alias for struct | ||
| 52 | * @inet_diag_req_v2. | ||
| 53 | */ | ||
| 54 | struct inet_diag_req_raw { | ||
| 55 | __u8 sdiag_family; | ||
| 56 | __u8 sdiag_protocol; | ||
| 57 | __u8 idiag_ext; | ||
| 58 | __u8 sdiag_raw_protocol; | ||
| 59 | __u32 idiag_states; | ||
| 60 | struct inet_diag_sockid id; | ||
| 61 | }; | ||
| 62 | |||
| 46 | enum { | 63 | enum { |
| 47 | INET_DIAG_REQ_NONE, | 64 | INET_DIAG_REQ_NONE, |
| 48 | INET_DIAG_REQ_BYTECODE, | 65 | INET_DIAG_REQ_BYTECODE, |