Module Name: src
Committed By: martin
Date: Mon Jun 20 16:06:38 UTC 2022
Modified Files:
src/usr.sbin/sysinst: label.c
Log Message:
PR 56893: fix input validation when the user moves a new partition to
a totaly different part of the disk. Fix size handling for freshly
added partitions (which would previously use random stack data due to
bogus error checking).
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/usr.sbin/sysinst/label.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.38 src/usr.sbin/sysinst/label.c:1.39
--- src/usr.sbin/sysinst/label.c:1.38 Sun Jun 19 12:08:31 2022
+++ src/usr.sbin/sysinst/label.c Mon Jun 20 16:06:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.38 2022/06/19 12:08:31 martin Exp $ */
+/* $NetBSD: label.c,v 1.39 2022/06/20 16:06:38 martin Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.38 2022/06/19 12:08:31 martin Exp $");
+__RCSID("$NetBSD: label.c,v 1.39 2022/06/20 16:06:38 martin Exp $");
#endif
#include <sys/types.h>
@@ -261,14 +261,18 @@ edit_fs_start(menudesc *m, void *arg)
start = getpartoff(edit->pset->parts, edit->info.start);
if (edit->info.size != 0) {
- /* Try to keep end in the same place */
- end = edit->info.start + edit->info.size;
- if (end < start)
- edit->info.size = edit->pset->parts->pscheme->
- max_free_space_at(edit->pset->parts,
- edit->info.start);
- else
- edit->info.size = end - start;
+ if (start < (edit->info.start+edit->info.size)) {
+ /* Try to keep end in the same place */
+ end = edit->info.start + edit->info.size;
+ if (end < start)
+ edit->info.size = edit->pset->parts->pscheme->
+ max_free_space_at(edit->pset->parts,
+ edit->info.start);
+ else
+ edit->info.size = end - start;
+ } else {
+ edit->info.size = 0;
+ }
}
edit->info.start = start;
return 0;
@@ -282,8 +286,9 @@ edit_fs_size(menudesc *m, void *arg)
daddr_t size;
/* get original partition data, in case start moved already */
- edit->pset->parts->pscheme->get_part_info(edit->pset->parts,
- edit->id, &pinfo);
+ if (!edit->pset->parts->pscheme->get_part_info(edit->pset->parts,
+ edit->id, &pinfo))
+ pinfo = edit->info;
/* ask for new size with old start and current values */
size = getpartsize(edit->pset->parts, pinfo.start,
edit->info.start, edit->info.size);
