diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-08-11 19:03:06 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2008-08-11 19:03:06 +0000 |
| commit | 6e6a8de3c64a3ec0a4431c18bc90d1fea9871926 (patch) | |
| tree | 7bf80f8c495025e90525d7ca071f76227c1e9aba /sbin/disklabel | |
| parent | ea91ab9f9b526bca7dd088aca047fc5e9dc7bf11 (diff) | |
fix a6 partition lookup where a static variable was incorrectly used in
the recursive findopenbsd() function. reported by PR 5905.
tested by many
ok deraadt@
Diffstat (limited to 'sbin/disklabel')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 56bbbb6dccb..aadc2f270a8 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.135 2008/08/10 13:00:25 sobrado Exp $ */ +/* $OpenBSD: disklabel.c,v 1.136 2008/08/11 19:03:05 reyk Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.135 2008/08/10 13:00:25 sobrado Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.136 2008/08/11 19:03:05 reyk Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -529,7 +529,8 @@ l_perror(char *s) struct dos_partition * findopenbsd(int f, off_t mbroff, struct dos_partition **first, int *n) { - static int mbr[DEV_BSIZE / sizeof(int)]; + static struct dos_partition res; + int mbr[DEV_BSIZE / sizeof(int)]; struct dos_partition *dp, *p; u_int16_t signature; u_int32_t start = 0; @@ -571,17 +572,20 @@ findopenbsd(int f, off_t mbroff, struct dos_partition **first, int *n) for (part = 0; part < NDOSPART; part++) { if (!letoh32(dp[part].dp_size)) continue; - if (first && *first == NULL) - *first = &dp[part]; + if (first && *first == NULL) { + bcopy(&dp[part], &res, sizeof(struct dos_partition)); + *first = &res; + } switch (dp[part].dp_typ) { case DOSPTYP_OPENBSD: fprintf(stderr, "# Inside MBR partition %d: " "type %02X start %u size %u\n", part, dp[part].dp_typ, letoh32(dp[part].dp_start), letoh32(dp[part].dp_size)); - dp[part].dp_start = - htole32((off_t)letoh32(dp[part].dp_start) + mbroff); - return (&dp[part]); + bcopy(&dp[part], &res, sizeof(struct dos_partition)); + res.dp_start = + htole32((off_t)letoh32(res.dp_start) + mbroff); + return (&res); case DOSPTYP_EXTEND: case DOSPTYP_EXTENDL: fprintf(stderr, "# Extended partition %d: " |