diff options
| author | Martynas Venckus <martynas@cvs.openbsd.org> | 2013-01-02 16:20:56 +0000 |
|---|---|---|
| committer | Martynas Venckus <martynas@cvs.openbsd.org> | 2013-01-02 16:20:56 +0000 |
| commit | 2295affeb4c0c4f4b69bc9283abc33ce87aee8f5 (patch) | |
| tree | e05cb7504c98ad635fdb77c9da81c81fc5050b49 /sys/arch | |
| parent | b04987c044f8884ca854ad702deccaa6a8f85408 (diff) | |
Zero out sbv_maskkey to make it boot when there's a softraid crypto
partition. OK jsing@.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/softraid.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/softraid.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c index 1fb19b8ebb9..105262c5715 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.1 2012/10/27 15:43:42 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.2 2013/01/02 16:20:55 martynas Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -169,8 +169,7 @@ srprobe(void) if (bv == NULL) { bv = alloc(sizeof(struct sr_boot_volume)); - bv->sbv_diskinfo = NULL; - bv->sbv_keys = NULL; + bzero(bv, sizeof(struct sr_boot_volume)); bv->sbv_level = md->ssdi.ssd_level; bv->sbv_volid = md->ssdi.ssd_volid; bv->sbv_chunk_no = md->ssdi.ssd_chunk_no; diff --git a/sys/arch/i386/stand/libsa/softraid.c b/sys/arch/i386/stand/libsa/softraid.c index a489db1ff94..105262c5715 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.1 2012/10/31 13:55:58 jsing Exp $ */ +/* $OpenBSD: softraid.c,v 1.2 2013/01/02 16:20:55 martynas Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -169,8 +169,7 @@ srprobe(void) if (bv == NULL) { bv = alloc(sizeof(struct sr_boot_volume)); - bv->sbv_diskinfo = NULL; - bv->sbv_keys = NULL; + bzero(bv, sizeof(struct sr_boot_volume)); bv->sbv_level = md->ssdi.ssd_level; bv->sbv_volid = md->ssdi.ssd_volid; bv->sbv_chunk_no = md->ssdi.ssd_chunk_no; |