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

inet: Check for supported protocol earlier

Browse source 
If we try to dump inet socket with unsupported proto we may fail
with strange error from get_unconn_sk(), since the socket will
not be found in hashes.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Reported-by: Julian Andres Klode <jak@jak-linux.org>
This commit is contained in:
Pavel Emelyanov 2015-09-24 19:41:00 +03:00
parent efa7dcf7c2
commit ee6fbf7c2f
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
sk-inet.c
View file

@ -91,7 +91,24 @@ static void show_one_inet_img(const char *act, const InetSkEntry *e)
e->state, src_addr);
}
static int can_dump_inet_sk(const struct inet_sk_desc *sk, int proto)
static int can_dump_ipproto(int ino, int proto)
{
/* Make sure it's a proto we support */
switch (proto) {
case IPPROTO_IP:
case IPPROTO_TCP:
case IPPROTO_UDP:
case IPPROTO_UDPLITE:
break;
default:
pr_err("Unsupported proto %d for socket %x\n", proto, ino);
return 0;
}
return 1;
}
static int can_dump_inet_sk(const struct inet_sk_desc *sk)
{
BUG_ON((sk->sd.family != AF_INET) && (sk->sd.family != AF_INET6));
@ -150,18 +167,6 @@ static int can_dump_inet_sk(const struct inet_sk_desc *sk, int proto)
return 0;
}
/* Make sure it's a proto we support */
switch (proto) {
case IPPROTO_IP:
case IPPROTO_TCP:
case IPPROTO_UDP:
case IPPROTO_UDPLITE:
break;
default:
pr_err("Unsupported proto %d for socket %x\n", proto, sk->sd.ino);
return 0;
}
return 1;
}
@ -237,6 +242,9 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
if (ret)
goto err;
if (!can_dump_ipproto(p->stat.st_ino, proto))
goto err;
sk = (struct inet_sk_desc *)lookup_socket(p->stat.st_ino, family, proto);
if (IS_ERR(sk))
goto err;
@ -246,7 +254,7 @@ static int do_dump_one_inet_fd(int lfd, u32 id, const struct fd_parms *p, int fa
goto err;
}
if (!can_dump_inet_sk(sk, proto))
if (!can_dump_inet_sk(sk))
goto err;
BUG_ON(sk->sd.already_dumped);