diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-05 21:30:41 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-12-05 21:30:41 +0000 |
| commit | a3e6aafd1aede63f1f4ef1581c42fb72290cedb1 (patch) | |
| tree | af0a5f59060a175abc028de84ea0b37dc9b02714 /sbin | |
| parent | 2bd1c4a418f5e739b871a9dcbc0ec3e83189f55d (diff) | |
Avoid an out-of-bounds array access in editor_delete() for invalid partition
name; spotted by Laurent Coustet (ed, debian-fr net)
ok deraadt@ otto@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/disklabel/editor.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index c2852873038..56505f28298 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.100 2005/11/16 03:12:12 krw Exp $ */ +/* $OpenBSD: editor.c,v 1.101 2005/12/05 21:30:40 miod Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -17,7 +17,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.100 2005/11/16 03:12:12 krw Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.101 2005/12/05 21:30:40 miod Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -754,18 +754,21 @@ editor_delete(struct disklabel *lp, char **mp, u_int32_t *freep, char *p) return; } c = p[0] - 'a'; - if (c < 0 || c >= lp->d_npartitions) + if (c < 0 || c >= lp->d_npartitions) { fprintf(stderr, "Partition must be between 'a' and '%c'.\n", 'a' + lp->d_npartitions - 1); - else if (c >= lp->d_npartitions || (lp->d_partitions[c].p_fstype == - FS_UNUSED && lp->d_partitions[c].p_size == 0)) + return; + } else if (lp->d_partitions[c].p_fstype == FS_UNUSED && + lp->d_partitions[c].p_size == 0) { fprintf(stderr, "Partition '%c' is not in use.\n", 'a' + c); - else if (c == RAW_PART) + return; + } else if (c == RAW_PART) { fputs( "You may not delete the 'c' partition. The 'c' partition must exist and\n" "should span the entire disk. By default it is of type 'unused' and so\n" "does not take up any space.\n", stderr); - else { + return; + } else { /* Update free sector count. */ if (lp->d_partitions[c].p_offset < ending_sector && lp->d_partitions[c].p_offset >= starting_sector && |