diff -ru xen-unstable.hg/tools/blktap/drivers/blktapctrl.c xen-unstable/tools/blktap/drivers/blktapctrl.c
--- xen-unstable.hg/tools/blktap/drivers/blktapctrl.c	2007-06-08 14:29:54.000000000 -0600
+++ xen-unstable/tools/blktap/drivers/blktapctrl.c	2007-06-11 16:06:11.000000000 -0600
@@ -143,7 +143,8 @@
 		return -1;
 	}
 
-	asprintf(&devname,"%s/%s%d",BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, *minor);
+	if (asprintf(&devname,"%s/%s%d",BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, *minor) == -1)
+		return -1;
 	make_blktap_dev(devname,*major,*minor);	
 	DPRINTF("Received device id %d and major %d, "
 		"sent domid %d and be_id %d\n",
@@ -495,20 +496,27 @@
 
 		if (!exist) {
 			DPRINTF("Process does not exist:\n");
-			asprintf(&rdctldev, 
-				 "%s/tapctrlread%d", BLKTAP_CTRL_DIR, minor);
-			blkif->fds[READ] = open_ctrl_socket(rdctldev);
-
+			if (asprintf(&rdctldev,
+				     "%s/tapctrlread%d", BLKTAP_CTRL_DIR, minor) == -1)
+				return -1;
+			if (asprintf(&wrctldev,
+				     "%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor) == -1) {
+				free(rdctldev);
+				return -1;
+			}
+			if (asprintf(&cmd, "tapdisk %s %s", wrctldev, rdctldev) == -1) {
+				free(rdctldev);
+				free(wrctldev);
+				return -1;
+			}
 
-			asprintf(&wrctldev, 
-				 "%s/tapctrlwrite%d", BLKTAP_CTRL_DIR, minor);
+			blkif->fds[READ] = open_ctrl_socket(rdctldev);
 			blkif->fds[WRITE] = open_ctrl_socket(wrctldev);
 			
 			if (blkif->fds[READ] == -1 || blkif->fds[WRITE] == -1) 
 				goto fail;
 
 			/*launch the new process*/
-			asprintf(&cmd, "tapdisk %s %s", wrctldev, rdctldev);
 			DPRINTF("Launching process, CMDLINE [%s]\n",cmd);
 			if (system(cmd) == -1) {
 				DPRINTF("Unable to fork, cmdline: [%s]\n",cmd);
@@ -692,7 +700,8 @@
 	register_new_unmap_hook(unmap_blktapctrl);
 
 	/* Attach to blktap0 */
-	asprintf(&devname,"%s/%s0", BLKTAP_DEV_DIR, BLKTAP_DEV_NAME);
+	if (asprintf(&devname,"%s/%s0", BLKTAP_DEV_DIR, BLKTAP_DEV_NAME) == -1)
+                goto open_failed;
 	if ((ret = xc_find_device_number("blktap0")) < 0) {
 		DPRINTF("couldn't find device number for 'blktap0'\n");
 		goto open_failed;
diff -ru xen-unstable.hg/tools/blktap/drivers/block-qcow.c xen-unstable/tools/blktap/drivers/block-qcow.c
--- xen-unstable.hg/tools/blktap/drivers/block-qcow.c	2007-06-08 14:29:54.000000000 -0600
+++ xen-unstable/tools/blktap/drivers/block-qcow.c	2007-06-11 16:06:11.000000000 -0600
@@ -871,7 +871,10 @@
 	}
 
 	s->fd = fd;
-	asprintf(&s->name,"%s", name);
+	if (asprintf(&s->name,"%s", name) == -1) {
+		close(fd);
+		return -1;
+	}
 
 	ASSERT(sizeof(QCowHeader) + sizeof(QCowHeader_ext) < 512);
 
@@ -1165,7 +1168,7 @@
 		offset = sizeof(QCowHeader) + sizeof(uint32_t);
 		lseek(fd, offset, SEEK_SET);
 		out = cpu_to_be32(cksum);
-		write(fd, &out, sizeof(uint32_t));
+		if (write(fd, &out, sizeof(uint32_t))) ;
 		close(fd);
 	}
 
diff -ru xen-unstable.hg/tools/blktap/drivers/tapdisk.c xen-unstable/tools/blktap/drivers/tapdisk.c
--- xen-unstable.hg/tools/blktap/drivers/tapdisk.c	2007-03-12 09:01:04.000000000 -0600
+++ xen-unstable/tools/blktap/drivers/tapdisk.c	2007-06-11 16:06:11.000000000 -0600
@@ -220,7 +220,8 @@
 	fd_list_entry_t *ptr;
 	int page_size;
 
-	asprintf(&devname,"%s/%s%d", BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, minor);
+	if (asprintf(&devname,"%s/%s%d", BLKTAP_DEV_DIR, BLKTAP_DEV_NAME, minor) == -1)
+		return -1;
 	tap_fd = open(devname, O_RDWR);
 	if (tap_fd == -1) 
 	{
diff -ru xen-unstable.hg/tools/blktap/lib/xenbus.c xen-unstable/tools/blktap/lib/xenbus.c
--- xen-unstable.hg/tools/blktap/lib/xenbus.c	2007-03-12 09:01:04.000000000 -0600
+++ xen-unstable/tools/blktap/lib/xenbus.c	2007-06-11 16:06:11.000000000 -0600
@@ -360,8 +360,7 @@
 	char *path;
 	struct xenbus_watch *vbd_watch;
 	
-	asprintf(&path, "/local/domain/%s/backend/tap", domid);
-	if (path == NULL) 
+	if (asprintf(&path, "/local/domain/%s/backend/tap", domid) == -1)
 		return -ENOMEM;
 	
 	vbd_watch = (struct xenbus_watch *)malloc(sizeof(struct xenbus_watch));
@@ -399,8 +398,7 @@
 	struct xenbus_watch *domid_watch;
 	char *path = NULL;
 
-	asprintf(&path, "/local/domain");
-	if (path == NULL) 
+	if (asprintf(&path, "/local/domain") == -1)
 		return -ENOMEM;
 
 	domid_watch = malloc(sizeof(struct xenbus_watch));
diff -ru xen-unstable.hg/tools/blktap/lib/xs_api.c xen-unstable/tools/blktap/lib/xs_api.c
--- xen-unstable.hg/tools/blktap/lib/xs_api.c	2007-02-21 13:42:10.000000000 -0700
+++ xen-unstable/tools/blktap/lib/xs_api.c	2007-06-11 16:06:42.000000000 -0600
@@ -126,10 +126,12 @@
 	ret = vasprintf(&buf, fmt, ap);
 	va_end(ap);
 	
-	asprintf(&path, "%s/%s", dir, node);
-	
-	if ((path == NULL) || (buf == NULL))
-		return 0;
+	if (ret == -1)
+		return ENOMEM;
+	if (asprintf(&path, "%s/%s", dir, node) == -1) {
+		free(buf);
+		return ENOMEM;
+	}
 
 	ret = xs_write(h, XBT_NULL, path, buf, strlen(buf)+1);
 	
@@ -180,10 +182,11 @@
 	
 	e = xs_directory(h, xth, "/local/domain", &num);
 	if (e == NULL)
-		return NULL;
+		goto done;
 
 	for (i = 0; (i < num) && (domid == NULL); i++) {
-		asprintf(&path, "/local/domain/%s/name", e[i]);
+		if (asprintf(&path, "/local/domain/%s/name", e[i]) == -1)
+			break;
 		val = xs_read(h, xth, path, &len);
 		free(path);
 		if (val == NULL)
@@ -191,29 +194,31 @@
 		
 		if (strcmp(val, DOMNAME) == 0) {
 			/* match! */
-			asprintf(&path, "/local/domain/%s/domid", e[i]);
+			if (asprintf(&path, "/local/domain/%s/domid", e[i]) == -1) {
+				free(val);
+				break;
+			}
 			domid = xs_read(h, xth, path, &len);
 			free(path);
 		}
 		free(val);
 	}
+done:
 	xs_transaction_end(h, xth, 0);
-	
-	free(e);
+	if (e)
+		free(e);
 	return domid;
 }
 
 int convert_dev_name_to_num(char *name) {
-	char *p_sd, *p_hd, *p_xvd, *p_plx, *p, *alpha,*ptr;
+	char *p, *ptr;
 	int majors[10] = {3,22,33,34,56,57,88,89,90,91};
 	int maj,i,ret = 0;
-
-	asprintf(&p_sd,"/dev/sd");
-	asprintf(&p_hd,"/dev/hd");
-	asprintf(&p_xvd,"/dev/xvd");
-	asprintf(&p_plx,"plx");
-	asprintf(&alpha,"abcdefghijklmnop");
-	
+	char *p_sd = "/dev/sd";
+	char *p_hd = "/dev/hd";
+	char *p_xvd = "/dev/xvd";
+	char *p_plx = "plx";
+	char *alpha = "abcdefghijklmnop";
 
 	if (strstr(name, p_sd) != NULL) {
 		p = name + strlen(p_sd);
@@ -251,12 +256,6 @@
 		ret = BASE_DEV_VAL;
 	}
 
-	free(p_sd);
-	free(p_hd);
-	free(p_xvd);
-	free(p_plx);
-	free(alpha);
-
 	return ret;
 }
 
diff -ru xen-unstable.hg/tools/console/daemon/io.c xen-unstable/tools/console/daemon/io.c
--- xen-unstable.hg/tools/console/daemon/io.c	2007-06-11 15:14:35.000000000 -0600
+++ xen-unstable/tools/console/daemon/io.c	2007-06-11 16:06:11.000000000 -0600
@@ -303,7 +303,10 @@
 		void *result = va_arg(ap, void *);
 		char *p;
 
-		asprintf(&path, "%s/%s", dir, name);
+		if (asprintf(&path, "%s/%s", dir, name) == -1) {
+			ret = ENOMEM;
+			break;
+		}
 		p = xs_read(xs, XBT_NULL, path, NULL);
 		free(path);
 		if (p == NULL) {