diff options
| author |   dlg <dlg@openbsd.org> | 2018-04-25 11:15:58 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2018-04-25 11:15:58 +0000 |
| commit | 85f30cb46d0aa3a003f1c7fd776a16c8d1b72c4b (patch) | |
| tree | 5afde83cfcb5ee6100811a04b439d38305f7e16b | |
| parent | Teach mtx_enter_try(9) to avoid deadlocks after a panic. (diff) | |
| download | wireguard-openbsd-85f30cb46d0aa3a003f1c7fd776a16c8d1b72c4b.tar.xz wireguard-openbsd-85f30cb46d0aa3a003f1c7fd776a16c8d1b72c4b.zip | |
use size_t for the size of buffers and strings, not int.
sprinkle some bounded attributes while here.
ok deraadt@
| -rw-r--r-- | share/man/man9/getsn.9 | 8 | ||||
| -rw-r--r-- | sys/lib/libkern/getsn.c | 9 | ||||
| -rw-r--r-- | sys/lib/libkern/libkern.h | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/share/man/man9/getsn.9 b/share/man/man9/getsn.9 index ceaf081f35f..204874279fc 100644 --- a/share/man/man9/getsn.9 +++ b/share/man/man9/getsn.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getsn.9,v 1.1 2018/04/23 10:30:39 dlg Exp $ +.\" $OpenBSD: getsn.9,v 1.2 2018/04/25 11:15:58 dlg Exp $ .\" .\" Copyright (c) 2002, 2003 CubeSoft Communications, Inc. .\" <http://www.csoft.org> @@ -24,7 +24,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 23 2018 $ +.Dd $Mdocdate: April 25 2018 $ .Dt GETSN 9 .Os .Sh NAME @@ -32,8 +32,8 @@ .Nd read user input from the console .Sh SYNOPSIS .In lib/libkern/libkern.h -.Ft int -.Fn getsn "char *cp" "int size" +.Ft size_t +.Fn getsn "char *cp" "size_t size" .Sh DESCRIPTION The .Fn getsn diff --git a/sys/lib/libkern/getsn.c b/sys/lib/libkern/getsn.c index 3bb3f218ad7..4342c1024a6 100644 --- a/sys/lib/libkern/getsn.c +++ b/sys/lib/libkern/getsn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getsn.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $ */ +/* $OpenBSD: getsn.c,v 1.7 2018/04/25 11:15:58 dlg Exp $ */ /* * Copyright (c) 1996 Theo de Raadt @@ -29,10 +29,11 @@ #include <sys/systm.h> #include <dev/cons.h> -int -getsn(char *cp, int size) +size_t +getsn(char *cp, size_t size) { - int len = 0, c; + size_t len = 0; + int c; char *lp = cp; while (1) { diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h index d743920ea0b..db020a8ed03 100644 --- a/sys/lib/libkern/libkern.h +++ b/sys/lib/libkern/libkern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libkern.h,v 1.34 2014/07/13 23:49:40 uebayasi Exp $ */ +/* $OpenBSD: libkern.h,v 1.35 2018/04/25 11:15:58 dlg Exp $ */ /* $NetBSD: libkern.h,v 1.7 1996/03/14 18:52:08 christos Exp $ */ /*- @@ -183,7 +183,8 @@ size_t strlcat(char *, const char *, size_t) int strcmp(const char *, const char *); int strncmp(const char *, const char *, size_t); int strncasecmp(const char *, const char *, size_t); -int getsn(char *, int); +size_t getsn(char *, size_t) + __attribute__ ((__bounded__(__string__,1,2))); char *strchr(const char *, int); char *strrchr(const char *, int); int timingsafe_bcmp(const void *, const void *, size_t); |