Skip to content

Commit da8e89c

Browse files
committed
unix: a unix name can be a non-null terminated string
In this patch, we replace all zero characters to '@'. ==30==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x60300000e3ca at pc 0x7f34144b6be1 bp 0x7ffee7b6bb20 sp 0x7ffee7b6b298 READ of size 26 at 0x60300000e3ca thread T0 #0 0x7f34144b6be0 (/lib64/libasan.so.3+0x8dbe0) #1 0x7f34144b8e4d in __interceptor_vsnprintf (/lib64/libasan.so.3+0x8fe4d) #2 0x4966cb in vprint_on_level criu/log.c:228 #3 0x496b64 in print_on_level criu/log.c:249 #4 0x505c94 in collect_one_unixsk criu/sk-unix.c:1401 #5 0x4e7ae3 in collect_image criu/protobuf.c:213 #6 0x462c5c in root_prepare_shared criu/cr-restore.c:247 #7 0x462c5c in restore_task_with_children criu/cr-restore.c:1420 #8 0x7f34132d70ec in __clone (/lib64/libc.so.6+0x1030ec) 0x60300000e3ca is located 0 bytes to the right of 26-byte region [0x60300000e3b0,0x60300000e3ca) allocated by thread T0 here: #0 0x7f34144efe70 in malloc (/lib64/libasan.so.3+0xc6e70) #1 0x7f3413bdb021 (/lib64/libprotobuf-c.so.1+0x6021) Signed-off-by: Andrei Vagin <[email protected]>
1 parent a26033e commit da8e89c

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

criu/sk-unix.c

+29-2
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,9 @@ static int bind_unix_sk(int sk, struct unix_sk_info *ui)
977977
int cwd_fd = -1, root_fd = -1;
978978
int ret = -1;
979979

980+
if (ui->ue->name.len == 0)
981+
return 0;
982+
980983
if ((ui->ue->type == SOCK_STREAM) && (ui->ue->state == TCP_ESTABLISHED)) {
981984
/*
982985
* FIXME this can be done, but for doing this properly we
@@ -1369,6 +1372,8 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
13691372
{
13701373
struct unix_sk_info *ui = o;
13711374
static bool post_queued = false;
1375+
char *uname, *prefix = "";
1376+
int ulen;
13721377

13731378
ui->ue = pb_msg(base, UnixSkEntry);
13741379
ui->name_dir = (void *)ui->ue->name_dir;
@@ -1398,10 +1403,32 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
13981403
INIT_LIST_HEAD(&ui->connected);
13991404
INIT_LIST_HEAD(&ui->node);
14001405
ui->flags = 0;
1401-
pr_info(" `- Got %#x peer %#x (name %s dir %s)\n",
1406+
1407+
uname = ui->name;
1408+
ulen = ui->ue->name.len;
1409+
if (ulen > 0 && uname[0] == 0) {
1410+
prefix = "@";
1411+
uname++;
1412+
ulen--;
1413+
if (strlen(uname) != ulen) {
1414+
/* replace zero characters */
1415+
char *s = alloca(ulen + 1);
1416+
int i;
1417+
1418+
for (i = 0; i < ulen; i++)
1419+
s[i] = uname[i] ? : '@';
1420+
uname = s;
1421+
}
1422+
} else if (ulen == 0) {
1423+
ulen = 1;
1424+
uname = "-";
1425+
}
1426+
1427+
pr_info(" `- Got %#x peer %#x (name %s%.*s dir %s)\n",
14021428
ui->ue->ino, ui->ue->peer,
1403-
ui->name ? (ui->name[0] ? ui->name : &ui->name[1]) : "-",
1429+
prefix, ulen, uname,
14041430
ui->name_dir ? ui->name_dir : "-");
1431+
14051432
list_add_tail(&ui->list, &unix_sockets);
14061433
return file_desc_add(&ui->d, ui->ue->id, &unix_desc_ops);
14071434
}

0 commit comments

Comments
 (0)