diff options
| -rw-r--r-- | sys/arch/alpha/alpha/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/arch/cats/cats/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/mvmeppc/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/arch/solbourne/solbourne/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/arch/zaurus/zaurus/autoconf.c | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c index bcc44dcd3f7..14015b55556 100644 --- a/sys/arch/alpha/alpha/autoconf.c +++ b/sys/arch/alpha/alpha/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.24 2004/12/25 23:02:21 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.25 2005/04/21 00:15:42 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */ /* @@ -314,7 +314,7 @@ setroot() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/cats/cats/autoconf.c b/sys/arch/cats/cats/autoconf.c index dfb7307bca5..4ce782a1360 100644 --- a/sys/arch/cats/cats/autoconf.c +++ b/sys/arch/cats/cats/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.4 2004/12/25 23:02:23 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.5 2005/04/21 00:15:42 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */ /* @@ -326,7 +326,7 @@ rootconf() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("rootconf: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c index 20159656193..f6650b37e2f 100644 --- a/sys/arch/macppc/macppc/autoconf.c +++ b/sys/arch/macppc/macppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.15 2004/12/25 23:02:24 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.16 2005/04/21 00:15:42 deraadt Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -37,7 +37,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.15 2004/12/25 23:02:24 miod Exp $ + * $Id: autoconf.c,v 1.16 2005/04/21 00:15:42 deraadt Exp $ */ /* @@ -330,7 +330,7 @@ setroot() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c index 720f1ae33a1..5af7911b9f1 100644 --- a/sys/arch/mvmeppc/mvmeppc/autoconf.c +++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.12 2004/12/25 23:02:25 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.13 2005/04/21 00:15:42 deraadt Exp $ */ /* * Copyright (c) 1996, 1997 Per Fogelstrom * Copyright (c) 1995 Theo de Raadt @@ -37,7 +37,7 @@ * from: Utah Hdr: autoconf.c 1.31 91/01/21 * * from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93 - * $Id: autoconf.c,v 1.12 2004/12/25 23:02:25 miod Exp $ + * $Id: autoconf.c,v 1.13 2005/04/21 00:15:42 deraadt Exp $ */ /* @@ -315,7 +315,7 @@ setroot() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/solbourne/solbourne/autoconf.c b/sys/arch/solbourne/solbourne/autoconf.c index 44f85549542..d002cd939f0 100644 --- a/sys/arch/solbourne/solbourne/autoconf.c +++ b/sys/arch/solbourne/solbourne/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.1 2005/04/19 21:30:18 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.2 2005/04/21 00:15:43 deraadt Exp $ */ /* OpenBSD: autoconf.c,v 1.64 2005/03/23 17:10:24 miod Exp */ /* @@ -742,7 +742,7 @@ setroot() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index d0c82ab803f..82e83456748 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.65 2005/04/11 01:50:07 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.66 2005/04/21 00:15:43 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -1912,7 +1912,7 @@ setroot() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 5de0ad1b132..598cc4f728f 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.38 2005/03/15 18:46:39 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.39 2005/04/21 00:15:43 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */ /* @@ -546,8 +546,8 @@ setroot() part = DISKPART(rootdev); len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), - unit); - if (len >= sizeof(buf)) + unit); + if (len == -1 || len >= sizeof(buf)) panic("setroot: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); diff --git a/sys/arch/zaurus/zaurus/autoconf.c b/sys/arch/zaurus/zaurus/autoconf.c index 1bd283fbd26..565db823edb 100644 --- a/sys/arch/zaurus/zaurus/autoconf.c +++ b/sys/arch/zaurus/zaurus/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.1 2004/12/31 00:04:35 drahn Exp $ */ +/* $OpenBSD: autoconf.c,v 1.2 2005/04/21 00:15:43 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.2 2001/09/05 16:17:36 matt Exp $ */ /* @@ -323,7 +323,7 @@ rootconf() len = snprintf(buf, sizeof buf, "%s%d", findblkname(majdev), unit); - if (len >= sizeof(buf)) + if (len == -1 || len >= sizeof(buf)) panic("rootconf: device name too long"); bootdv = getdisk(buf, len, part, &rootdev); |