mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-05 00:35:23 +00:00
Code Issues Releases Wiki Activity

inet: raw -- Check for kernel diag module support

Browse Source 
To collect raw sockets we need the kernel to support raw_diag module.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Cyrill Gorcunov
2018-09-13 22:57:46 +03:00
committed by Andrei Vagin
parent 8f1155379c
commit 47ccf9a28b
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
criu/cr-check.c
View File

@@ -1086,6 +1086,13 @@ static int check_kcmp_epoll(void)
return 0;
}
static int check_net_diag_raw(void)
{
check_sock_diag();
return (socket_test_collect_bit(AF_INET, IPPROTO_RAW) &&
socket_test_collect_bit(AF_INET6, IPPROTO_RAW)) ? 0 : -1;
}
static int (*chk_feature)(void);
/*
@@ -1194,6 +1201,7 @@ int cr_check(void)
ret |= check_uffd_noncoop();
ret |= check_sk_netns();
ret |= check_kcmp_epoll();
ret |= check_net_diag_raw();
}
/*
@@ -1292,6 +1300,7 @@ static struct feature_list feature_list[] = {
{ "can_map_vdso", check_can_map_vdso},
{ "sk_ns", check_sk_netns },
{ "sk_unix_file", check_sk_unix_file },
{ "net_diag_raw", check_net_diag_raw },
{ "nsid", check_nsid },
{ "link_nsid", check_link_nsid},
{ "kcmp_epoll", check_kcmp_epoll},

33
criu/sockets.c
View File

@@ -141,9 +141,11 @@ enum socket_cl_bits
INET_TCP_CL_BIT,
INET_UDP_CL_BIT,
INET_UDPLITE_CL_BIT,
INET_RAW_CL_BIT,
INET6_TCP_CL_BIT,
INET6_UDP_CL_BIT,
INET6_UDPLITE_CL_BIT,
INET6_RAW_CL_BIT,
UNIX_CL_BIT,
PACKET_CL_BIT,
_MAX_CL_BIT,
@@ -169,6 +171,8 @@ enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsigned int proto)
return INET_UDP_CL_BIT;
if (proto == IPPROTO_UDPLITE)
return INET_UDPLITE_CL_BIT;
if (proto == IPPROTO_RAW)
return INET_RAW_CL_BIT;
}
if (family == AF_INET6) {
if (proto == IPPROTO_TCP)
@@ -177,6 +181,8 @@ enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsigned int proto)
return INET6_UDP_CL_BIT;
if (proto == IPPROTO_UDPLITE)
return INET6_UDPLITE_CL_BIT;
if (proto == IPPROTO_RAW)
return INET6_RAW_CL_BIT;
}
pr_err("Unknown pair family %d proto %d\n", family, proto);
@@ -686,6 +692,9 @@ static int inet_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg)
case IPPROTO_UDPLITE:
type = SOCK_DGRAM;
break;
case IPPROTO_RAW:
type = SOCK_RAW;
break;
default:
BUG_ON(1);
return -1;
@@ -761,6 +770,18 @@ int collect_sockets(struct ns_id *ns)
if (tmp)
err = tmp;
/* Collect IPv4 RAW sockets */
req.r.i.sdiag_family = AF_INET;
req.r.i.sdiag_protocol = IPPROTO_RAW;
req.r.i.idiag_ext = 0;
req.r.i.idiag_states = -1; /* All */
tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, ns, &req.r.i);
if (tmp) {
pr_warn("The current kernel doesn't support ipv4 raw_diag module\n");
if (tmp != -ENOENT)
err = tmp;
}
/* Collect IPv6 TCP sockets */
req.r.i.sdiag_family = AF_INET6;
req.r.i.sdiag_protocol = IPPROTO_TCP;
@@ -792,6 +813,18 @@ int collect_sockets(struct ns_id *ns)
if (tmp)
err = tmp;
/* Collect IPv6 RAW sockets */
req.r.i.sdiag_family = AF_INET6;
req.r.i.sdiag_protocol = IPPROTO_RAW;
req.r.i.idiag_ext = 0;
req.r.i.idiag_states = -1; /* All */
tmp = do_collect_req(nl, &req, sizeof(req), inet_receive_one, ns, &req.r.i);
if (tmp) {
pr_warn("The current kernel doesn't support ipv6 raw_diag module\n");
if (tmp != -ENOENT)
err = tmp;
}
req.r.p.sdiag_family = AF_PACKET;
req.r.p.sdiag_protocol = 0;
req.r.p.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MCLIST |