Date: Fri, 4 Oct 2013 09:02:03 +0000 (UTC) From: Peter Holm <pho@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256044 - user/pho/stress2/misc Message-ID: <201310040902.r949237n006150@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pho Date: Fri Oct 4 09:02:02 2013 New Revision: 256044 URL: http://svnweb.freebsd.org/changeset/base/256044 Log: Added a regression test. Sponsored by: EMC / Isilon storage division Added: user/pho/stress2/misc/setuid.sh (contents, props changed) Added: user/pho/stress2/misc/setuid.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/setuid.sh Fri Oct 4 09:02:02 2013 (r256044) @@ -0,0 +1,118 @@ +#!/bin/sh + +# +# Copyright (c) 2013 EMC Corp. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# + +# Regression test for r218019: "panic: oof, we didn't get our fd" + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +odir=`pwd` +cd /tmp +sed '1,/^EOF/d' < $odir/$0 > setuid.c +rm -f /tmp/setuid +cc -o setuid -Wall -Wextra -O2 -g setuid.c -static || exit 1 +rm -f setuid.c + +mount | grep $mntpoint | grep -q /dev/md && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 2g -u $mdstart || exit 1 +bsdlabel -w md$mdstart auto +newfs -U md${mdstart}$part > /dev/null +mount /dev/md${mdstart}$part $mntpoint +chmod 777 $mntpoint +mkdir $mntpoint/root + +cp /tmp/setuid $mntpoint/root/nop +chown nobody:nobody $mntpoint/root/nop +chmod 4755 $mntpoint/root/nop + +chmod 777 $mntpoint/root + +echo "Expect Abort trap" +./setuid $mntpoint/root 1 +./setuid $mntpoint/root 2 +./setuid $mntpoint/root 3 +./setuid $mntpoint/root 4 +./setuid $mntpoint/root 5 +./setuid $mntpoint/root 6 +./setuid $mntpoint/root 7 + +while mount | grep "on $mntpoint " | grep -q /dev/md; do + umount $mntpoint || sleep 1 +done +rm -f /tmp/setuid /tmp/nop +exit +EOF +#include <sys/types.h> +#include <pwd.h> +#include <err.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +int +main(int argc, char **argv) +{ + char *av[3]; + int fd; + + if (argc == 1) + return (0); + + if (chroot(argv[1]) != 0) + err(1, "chroot(%s)", argv[1]); + fd = atoi(argv[2]); + + if (fd & 1) { + fprintf(stderr, "Close fd 0 "); + close(0); + } + if (fd & 2) { + fprintf(stderr, "Close fd 1 "); + close(1); + } + if (fd & 4) { + fprintf(stderr, "Close fd 2\n"); + close(2); + } else + fprintf(stderr, "\n"); + + if (chdir("/") != 0) + err(1, "chdir"); + av[0] = "nop"; + av[1] = "nop"; + av[3] = 0; + if (execve(av[0], av, NULL) == -1) + err(1, "execve"); + + return (0); +}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310040902.r949237n006150>