From ef432583040081d813aa2d11e36195f2b1242329 Mon Sep 17 00:00:00 2001
From: tedu <tedu@openbsd.org>
Date: Sat, 12 Jul 2014 20:58:31 +0000
Subject: [PATCH] revert more free fallout

---
 sys/arch/amd64/stand/libsa/diskprobe.c |  8 ++++----
 sys/arch/amd64/stand/libsa/softraid.c  | 12 ++++++------
 sys/arch/i386/stand/libsa/diskprobe.c  |  8 ++++----
 sys/arch/i386/stand/libsa/softraid.c   | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/sys/arch/amd64/stand/libsa/diskprobe.c b/sys/arch/amd64/stand/libsa/diskprobe.c
index 7a64b298ca6..3f17a24b960 100644
--- a/sys/arch/amd64/stand/libsa/diskprobe.c
+++ b/sys/arch/amd64/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.14 2014/07/12 18:44:41 tedu Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.15 2014/07/12 20:58:31 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -79,7 +79,7 @@ floppyprobe(void)
 			if (debug)
 				printf(" <!fd%u>", i);
 #endif
-			free(dip, 0, 0);
+			free(dip, 0);
 			break;
 		}
 
@@ -122,7 +122,7 @@ hardprobe(void)
 			if (debug)
 				printf(" <!hd%u>", i&0x7f);
 #endif
-			free(dip, 0, 0);
+			free(dip, 0);
 			break;
 		}
 
@@ -234,7 +234,7 @@ cdprobe(void)
 #if 0
 	if (bios_getdiskinfo(cddev, &dip->bios_info)) {
 		printf(" <!cd0>");	/* XXX */
-		free(dip, 0, 0);
+		free(dip, 0);
 		return;
 	}
 #endif
diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c
index 15679a72b35..7f840a10be2 100644
--- a/sys/arch/amd64/stand/libsa/softraid.c
+++ b/sys/arch/amd64/stand/libsa/softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.7 2014/07/12 18:44:41 tedu Exp $	*/
+/*	$OpenBSD: softraid.c,v 1.8 2014/07/12 20:58:31 tedu Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -315,7 +315,7 @@ srprobe(void)
 	}
 
 	explicit_bzero(md, SR_META_SIZE * 512);
-	free(md, 0, 0);
+	free(md, 0);
 }
 
 int
@@ -477,18 +477,18 @@ sr_clear_keys(void)
 			continue;
 		if (bv->sbv_keys != NULL) {
 			explicit_bzero(bv->sbv_keys, SR_CRYPTO_KEYBLOCK_BYTES);
-			free(bv->sbv_keys, 0, 0);
+			free(bv->sbv_keys, 0);
 			bv->sbv_keys = NULL;
 		}
 		if (bv->sbv_maskkey != NULL) {
 			explicit_bzero(bv->sbv_maskkey, SR_CRYPTO_MAXKEYBYTES);
-			free(bv->sbv_maskkey, 0, 0);
+			free(bv->sbv_maskkey, 0);
 			bv->sbv_maskkey = NULL;
 		}
 	}
 	SLIST_FOREACH(kd, &sr_keydisks, kd_link) {
 		explicit_bzero(kd, sizeof(*kd));
-		free(kd, 0, 0);
+		free(kd, 0);
 	}
 }
 
@@ -618,7 +618,7 @@ done:
 
 	if (keys != NULL && rv != 0) {
 		explicit_bzero(keys, SR_CRYPTO_KEYBLOCK_BYTES);
-		free(keys, 0, 0);
+		free(keys, 0);
 	}
 
 	return (rv);
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c
index 08760fba81f..cfb6fb23b7b 100644
--- a/sys/arch/i386/stand/libsa/diskprobe.c
+++ b/sys/arch/i386/stand/libsa/diskprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskprobe.c,v 1.38 2014/07/12 18:44:42 tedu Exp $	*/
+/*	$OpenBSD: diskprobe.c,v 1.39 2014/07/12 20:58:31 tedu Exp $	*/
 
 /*
  * Copyright (c) 1997 Tobias Weingartner
@@ -79,7 +79,7 @@ floppyprobe(void)
 			if (debug)
 				printf(" <!fd%u>", i);
 #endif
-			free(dip, 0, 0);
+			free(dip, 0);
 			break;
 		}
 
@@ -122,7 +122,7 @@ hardprobe(void)
 			if (debug)
 				printf(" <!hd%u>", i&0x7f);
 #endif
-			free(dip, 0, 0);
+			free(dip, 0);
 			break;
 		}
 
@@ -234,7 +234,7 @@ cdprobe(void)
 #if 0
 	if (bios_getdiskinfo(cddev, &dip->bios_info)) {
 		printf(" <!cd0>");	/* XXX */
-		free(dip, 0, 0);
+		free(dip, 0);
 		return;
 	}
 #endif
diff --git a/sys/arch/i386/stand/libsa/softraid.c b/sys/arch/i386/stand/libsa/softraid.c
index f887187bf01..7f840a10be2 100644
--- a/sys/arch/i386/stand/libsa/softraid.c
+++ b/sys/arch/i386/stand/libsa/softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.7 2014/07/12 18:44:42 tedu Exp $	*/
+/*	$OpenBSD: softraid.c,v 1.8 2014/07/12 20:58:31 tedu Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -315,7 +315,7 @@ srprobe(void)
 	}
 
 	explicit_bzero(md, SR_META_SIZE * 512);
-	free(md, 0, 0);
+	free(md, 0);
 }
 
 int
@@ -477,18 +477,18 @@ sr_clear_keys(void)
 			continue;
 		if (bv->sbv_keys != NULL) {
 			explicit_bzero(bv->sbv_keys, SR_CRYPTO_KEYBLOCK_BYTES);
-			free(bv->sbv_keys, 0, 0);
+			free(bv->sbv_keys, 0);
 			bv->sbv_keys = NULL;
 		}
 		if (bv->sbv_maskkey != NULL) {
 			explicit_bzero(bv->sbv_maskkey, SR_CRYPTO_MAXKEYBYTES);
-			free(bv->sbv_maskkey, 0, 0);
+			free(bv->sbv_maskkey, 0);
 			bv->sbv_maskkey = NULL;
 		}
 	}
 	SLIST_FOREACH(kd, &sr_keydisks, kd_link) {
 		explicit_bzero(kd, sizeof(*kd));
-		free(kd, 0, 0);
+		free(kd, 0);
 	}
 }
 
@@ -618,7 +618,7 @@ done:
 
 	if (keys != NULL && rv != 0) {
 		explicit_bzero(keys, SR_CRYPTO_KEYBLOCK_BYTES);
-		free(keys, 0, 0);
+		free(keys, 0);
 	}
 
 	return (rv);
-- 
2.20.1