diff options
author | anton <anton@cvs.openbsd.org> | 2018-12-17 19:29:56 +0000 |
---|---|---|
committer | anton <anton@cvs.openbsd.org> | 2018-12-17 19:29:56 +0000 |
commit | 48566492156396e27c645e5e16c146affb5378ce (patch) | |
tree | 00aa73d4368f43f899ff3faf582ad7729e1488f4 /regress/sys | |
parent | 46a1f493afdc9f2e0d470fb8cddb362cbdca48bd (diff) |
ensure inappropriate ioctl commands are rejected
Diffstat (limited to 'regress/sys')
-rw-r--r-- | regress/sys/dev/wscons/Makefile | 17 | ||||
-rw-r--r-- | regress/sys/dev/wscons/wscons.c | 53 |
2 files changed, 69 insertions, 1 deletions
diff --git a/regress/sys/dev/wscons/Makefile b/regress/sys/dev/wscons/Makefile index 4dcee356e41..92a5a763390 100644 --- a/regress/sys/dev/wscons/Makefile +++ b/regress/sys/dev/wscons/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2018/12/17 19:26:25 anton Exp $ +# $OpenBSD: Makefile,v 1.6 2018/12/17 19:29:55 anton Exp $ WARNINGS= yes @@ -29,4 +29,19 @@ ${PROG_sigio}-$d-$t: ${PROG_sigio} . endfor .endfor +PROG_wscons= wscons +PROGS+= ${PROG_wscons} +SRCS_wscons= wscons.c util.c + +TESTS_wscons+= ioctl-unknown + +.for d in ${DEVICES} +. for t in ${TESTS_wscons} +REGRESS_TARGETS+= ${PROG_wscons}-$d-$t +${PROG_wscons}-$d-$t: ${PROG_wscons} + @echo "\n======== ${@} ========" + ./${PROG_wscons} -d /dev/$d $t +. endfor +.endfor + .include <bsd.regress.mk> diff --git a/regress/sys/dev/wscons/wscons.c b/regress/sys/dev/wscons/wscons.c new file mode 100644 index 00000000000..552190b4926 --- /dev/null +++ b/regress/sys/dev/wscons/wscons.c @@ -0,0 +1,53 @@ +/* $OpenBSD: wscons.c,v 1.1 2018/12/17 19:29:55 anton Exp $ */ + +/* + * Copyright (c) 2018 Anton Lindqvist <anton@openbsd.org> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include <sys/ioctl.h> + +#include <err.h> +#include <errno.h> +#include <stdlib.h> + +#include "util.h" + +static int test_ioctl_unknown(int); + +/* + * Test that inappropriate ioctl commands are rejected. + */ +static int +test_ioctl_unknown(int fd) +{ + if (ioctl(fd, TIOCSCTTY) == -1) { + if (errno != ENOTTY) + err(1, "ioctl: TIOCSCTTY"); + } else { + errx(1, "ioctl: TIOCSCTTY: not rejected"); + } + return 0; +} + +int +main(int argc, char *argv[]) +{ + struct test tests[] = { + { "ioctl-unknown", test_ioctl_unknown }, + { NULL, NULL }, + }; + + return dotest(argc, argv, tests); +} |