From: krw <krw@openbsd.org>
Date: Fri, 11 Nov 2022 18:53:29 +0000 (+0000)
Subject: Revert last until we can guarantee gh_guid can't escape to the
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6ac26791c1f95bad1cdc5e2c0733a8db49444b0a;p=openbsd

Revert last until we can guarantee gh_guid can't escape to the
d_uid written to disk.
---

diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index fddab8a9a57..9d7383b766f 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_disk.c,v 1.269 2022/11/11 12:14:01 krw Exp $	*/
+/*	$OpenBSD: subr_disk.c,v 1.270 2022/11/11 18:53:29 krw Exp $	*/
 /*	$NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $	*/
 
 /*
@@ -688,7 +688,6 @@ spoofgpt(struct buf *bp, void (*strat)(struct buf *), const uint8_t *dosbb,
 	}
 
 	lp->d_magic = DISKMAGIC;
-	memcpy(lp->d_uid, (char *)&gh.gh_guid, sizeof(lp->d_uid));
 	*partoffp = partoff;
 	free(gp, M_DEVBUF, gpbytes);