src/usr.bin/kdump/ktrstruct.c - diff

Return to ktrstruct.c CVS log

Up to [local] / src / usr.bin / kdump

Diff for /src/usr.bin/kdump/ktrstruct.c between version 1.26 and 1.27

version 1.26, 2018/11/05 17:05:50

version 1.27, 2018/11/08 18:35:56

Line 324

size_t i;

int fd;

for (i = 0; i < count - 1; i++) {

printf("int");

if (count > 1)

printf(" [%zu] { ", count);

for (i = 0; i < count; i++) {

memcpy(&fd, &data[i * sizeof(fd)], sizeof(fd));

printf("fd[%zu] = %d, ", i, fd);

printf("%d%s", fd, i < count - 1 ? ", " : "");

}

memcpy(&fd, &data[i * sizeof(fd)], sizeof(fd));

if (count > 1)

printf("fd[%zu] = %d\n", i, fd);

printf(" }");

printf("\n");

}

static void

Line 545

Line 549

goto invalid;

data = buf + namelen + 1;

datalen = buflen - namelen - 1;

if (datalen == 0)

goto invalid;

/* sanity check */

for (i = 0; i < namelen; ++i)

if (!isalpha((unsigned char)name[i]))

Line 563

Line 566

if (datalen > sizeof(ss))

goto invalid;

if (datalen < offsetof(struct sockaddr_storage, ss_len) +

sizeof(ss.ss_len))

goto invalid;

memcpy(&ss, data, datalen);

if ((ss.ss_family != AF_UNIX &&

datalen < sizeof(struct sockaddr)) || datalen != ss.ss_len)

Line 652

Line 658

ktrpollfd(data, datalen / sizeof(struct pollfd));

} else if (strcmp(name, "cmsghdr") == 0) {

char *cmsg;

if (datalen == 0)

goto invalid;

if ((cmsg = malloc(datalen)) == NULL)

err(1, "malloc");