diff options
| author | phk <phk@FreeBSD.org> | 2004-09-11 17:57:51 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-09-11 17:57:51 +0000 |
| commit | 9b11b1fb2c5a446780a0da0348482f30ddf3c026 (patch) | |
| tree | 90b20c5b9c0164d6fb86a517c8ba8d4114c95211 /sys/geom/bde | |
| parent | 0ebd18fb945c931273e73d94c8ff1746d18cd953 (diff) | |
| download | FreeBSD-src-9b11b1fb2c5a446780a0da0348482f30ddf3c026.zip FreeBSD-src-9b11b1fb2c5a446780a0da0348482f30ddf3c026.tar.gz | |
Respect that G_BDE_MAXKEYS is a compile time variable.
Diffstat (limited to 'sys/geom/bde')
| -rw-r--r-- | sys/geom/bde/g_bde_lock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c index 86c28c4..d429984 100644 --- a/sys/geom/bde/g_bde_lock.c +++ b/sys/geom/bde/g_bde_lock.c @@ -428,10 +428,9 @@ g_bde_decrypt_lockx(struct g_bde_softc *sc, u_char *meta, off_t mediasize, u_int return (ENOENT); /* If we have an unsorted lock-sequence, refuse */ - if (gl->lsector[0] > gl->lsector[1] || - gl->lsector[1] > gl->lsector[2] || - gl->lsector[2] > gl->lsector[3]) - return (EINVAL); + for (i = 0; i < G_BDE_MAXKEYS - 1; i++) + if (gl->lsector[i] >= gl->lsector[i + 1]) + return (EINVAL); /* Finally, find out which key was used by matching the byte offset */ for (i = 0; i < G_BDE_MAXKEYS; i++) |
