D15166.id41748.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15166.id41748.diff
View Options

	Index: usr.sbin/camdd/camdd.c
	===================================================================
	--- usr.sbin/camdd/camdd.c
	+++ usr.sbin/camdd/camdd.c
	@@ -596,14 +596,12 @@
	size_t ke_size;
	int retval = 0;

	- dev = malloc(sizeof(*dev));
	+ dev = calloc(1, sizeof(*dev));
	if (dev == NULL) {
	warn("%s: unable to malloc %zu bytes", __func__, sizeof(*dev));
	goto bailout;
	}

	- bzero(dev, sizeof(*dev));
	-
	dev->dev_type = dev_type;
	dev->io_timeout = timeout;
	dev->retry_count = retry_count;
	@@ -636,12 +634,11 @@
	}

	ke_size = sizeof(struct kevent) * (num_ke + 4);
	- ke = malloc(ke_size);
	+ ke = calloc(1, ke_size);
	if (ke == NULL) {
	warn("%s: unable to malloc %zu bytes", __func__, ke_size);
	goto bailout;
	}
	- bzero(ke, ke_size);
	if (num_ke > 0)
	bcopy(new_ke, ke, num_ke * sizeof(struct kevent));

	@@ -688,13 +685,12 @@
	break;
	}

	- buf = malloc(sizeof(*buf));
	+ buf = calloc(1, sizeof(*buf));
	if (buf == NULL) {
	warn("unable to allocate %zu bytes", sizeof(*buf));
	goto bailout_error;
	}

	- bzero(buf, sizeof(*buf));
	buf->buf_type = buf_type;
	buf->dev = dev;
	switch (buf_type) {