Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-18 00:58:31 +00:00
Code Issues Projects Releases Wiki Activity

criu: the type of a socket inode has to be "unsigned int"

Browse source 
(00.015271) unix: 	Add a peer: ino 2203289876 peer_ino 2203289875 family    1 type    1 state  1 name /mnt/test/zdtm/static/sockets03.test
(00.015277) Warn  (criu/sk-unix.c:475): unix: Shutdown mismatch -2091677421:1 -> -2091677420:0

Reported-by: Mr Jenkins
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Andrei Vagin 2020-08-10 20:57:15 -07:00
parent a6b00b1a7a
commit 5b751fbaf8
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
criu/sk-inet.c
View file

@ -116,7 +116,7 @@ static void show_one_inet_img(const char *act, const InetSkEntry *e)
src_addr);
}
static int can_dump_ipproto(int ino, int proto, int type)
static int can_dump_ipproto(unsigned int ino, int proto, int type)
{
/* Raw sockets may have any protocol inside */
if (type == SOCK_RAW)

14
criu/sk-unix.c
View file

@ -472,7 +472,7 @@ static int dump_one_unix_fd(int lfd, uint32_t id, const struct fd_parms *p)
* to check both ends on read()/write(). Thus mismatched sockets behave
* the same way as matched.
*/
pr_warn("Shutdown mismatch %d:%d -> %d:%d\n",
pr_warn("Shutdown mismatch %u:%d -> %u:%d\n",
ue->ino, ue->shutdown, peer->sd.ino, peer->shutdown);
}
} else if (ue->state == TCP_ESTABLISHED) {
@ -947,7 +947,7 @@ void init_sk_info_hash(void)
INIT_HLIST_HEAD(&sk_info_hash[i]);
}
static struct unix_sk_info *find_unix_sk_by_ino(int ino)
static struct unix_sk_info *find_unix_sk_by_ino(unsigned int ino)
{
struct unix_sk_info *ui;
struct hlist_head *chain;
@ -1145,7 +1145,7 @@ static int shutdown_unix_sk(int sk, struct unix_sk_info *ui)
return -1;
}
pr_debug("Socket %d is shut down %d\n", ue->ino, how);
pr_debug("Socket %u is shut down %d\n", ue->ino, how);
return 0;
}
@ -1825,13 +1825,13 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
int ret, sks[2];
if (ui->ue->type != SOCK_STREAM) {
pr_err("Non-stream socket %d in established state\n",
pr_err("Non-stream socket %u in established state\n",
ui->ue->ino);
return -1;
}
if (ui->ue->shutdown != SK_SHUTDOWN__BOTH) {
pr_err("Wrong shutdown/peer state for %d\n",
pr_err("Wrong shutdown/peer state for %u\n",
ui->ue->ino);
return -1;
}
@ -1909,7 +1909,7 @@ static int open_unixsk_standalone(struct unix_sk_info *ui, int *new_fd)
}
if (ui->ue->state == TCP_LISTEN) {
pr_info("\tPutting %d into listen state\n", ui->ue->ino);
pr_info("\tPutting %u into listen state\n", ui->ue->ino);
if (listen(sk, ui->ue->backlog) < 0) {
pr_perror("Can't make usk listen");
close(sk);
@ -2267,7 +2267,7 @@ static int fixup_unix_peer(struct unix_sk_info *ui)
struct unix_sk_info *peer = ui->peer;
if (!peer) {
pr_err("FATAL: Peer %d unresolved for %d\n",
pr_err("FATAL: Peer %u unresolved for %u\n",
ui->ue->peer, ui->ue->ino);
return -1;
}