2014-08-08 14:05:25 +02:00
|
|
|
#!/usr/bin/env bash
|
2013-09-24 15:15:55 +02:00
|
|
|
set -e
|
|
|
|
|
2014-08-08 14:05:25 +02:00
|
|
|
#
|
|
|
|
# This script creates a bootable image and should at some point in the future
|
|
|
|
# be replaced by makefs.
|
|
|
|
#
|
2014-08-06 15:11:22 +02:00
|
|
|
# Supported command line switches:
|
|
|
|
# -i build iso image instead of qemu imaeg
|
|
|
|
# -b bitcode build, increase partition sizes as necessary
|
|
|
|
#
|
2014-08-08 14:05:25 +02:00
|
|
|
|
2013-09-24 15:15:55 +02:00
|
|
|
: ${ARCH=i386}
|
|
|
|
: ${OBJ=../obj.${ARCH}}
|
|
|
|
: ${CROSS_TOOLS=${OBJ}/"tooldir.`uname -s`-`uname -r`-`uname -m`"/bin}
|
|
|
|
: ${CROSS_PREFIX=${CROSS_TOOLS}/i586-elf32-minix-}
|
|
|
|
: ${JOBS=1}
|
|
|
|
: ${DESTDIR=${OBJ}/destdir.$ARCH}
|
2014-08-08 14:05:25 +02:00
|
|
|
: ${RELEASETOOLSDIR=./releasetools/}
|
2013-09-24 15:15:55 +02:00
|
|
|
: ${FSTAB=${DESTDIR}/etc/fstab}
|
|
|
|
: ${BUILDVARS=}
|
|
|
|
: ${BUILDSH=build.sh}
|
2014-06-10 17:05:29 +02:00
|
|
|
: ${CREATE_IMAGE_ONLY=0}
|
2014-08-08 14:05:25 +02:00
|
|
|
: ${RC=minix_x86.rc}
|
2013-11-05 15:43:44 +01:00
|
|
|
|
2013-09-24 15:15:55 +02:00
|
|
|
#
|
|
|
|
# Directory where to store temporary file system images
|
|
|
|
#
|
|
|
|
: ${IMG_DIR=${OBJ}/img}
|
2014-08-08 14:05:25 +02:00
|
|
|
: ${CDFILES=${IMG_DIR}/cd}
|
|
|
|
|
|
|
|
# All sized are written in 512 byte blocks
|
|
|
|
#
|
|
|
|
# we create a disk image of about 2 gig's
|
|
|
|
# for alignment reasons, prefer sizes which are multiples of 4096 bytes
|
|
|
|
#
|
2014-08-06 15:11:22 +02:00
|
|
|
# these sizes are insufficient for bitcode builds!
|
|
|
|
# invoke this script with the -b flag to increase sizes accordingly
|
|
|
|
#
|
2014-08-08 14:05:25 +02:00
|
|
|
: ${ROOT_SIZE=$(( 64*(2**20) / 512))}
|
|
|
|
: ${HOME_SIZE=$(( 128*(2**20) / 512))}
|
|
|
|
: ${USR_SIZE=$(( 1792*(2**20) / 512))}
|
2013-11-05 15:43:44 +01:00
|
|
|
|
2014-08-08 14:05:25 +02:00
|
|
|
#
|
|
|
|
# Do some math to determine the start addresses of the partitions.
|
|
|
|
# Don't leave holes so the 'partition' invocation later is easy.
|
|
|
|
#
|
2013-09-24 15:15:55 +02:00
|
|
|
|
|
|
|
|
2014-08-08 14:05:25 +02:00
|
|
|
# Where the kernel & boot modules will be
|
|
|
|
MODDIR=${DESTDIR}/boot/minix/.temp
|
2013-09-24 15:15:55 +02:00
|
|
|
|
2014-08-06 15:11:22 +02:00
|
|
|
while getopts "ib" c
|
2013-11-05 15:43:44 +01:00
|
|
|
do
|
|
|
|
case "$c" in
|
|
|
|
i) : ${IMG=minix_x86.iso}
|
|
|
|
ISOMODE=1
|
|
|
|
;;
|
2014-08-06 15:11:22 +02:00
|
|
|
b) # bitcode build: increase partition sizes
|
|
|
|
ROOT_SIZE="$((${ROOT_SIZE} + 192*(2**20) / 512))"
|
|
|
|
USR_SIZE="$((${USR_SIZE} + 256*(2**20) / 512))"
|
|
|
|
;;
|
2013-11-05 15:43:44 +01:00
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
|
|
|
: ${IMG=minix_x86.img}
|
2014-08-08 14:05:25 +02:00
|
|
|
|
|
|
|
if [ "x${ISOMODE}" = "x1" ]
|
|
|
|
then
|
|
|
|
# In iso mode, make all FSes fit (i.e. as small as possible), but
|
|
|
|
# leave some space on /
|
|
|
|
ROOTSIZEARG="-x 5"
|
|
|
|
else
|
|
|
|
# In hd image mode, FSes have fixed sizes
|
|
|
|
ROOTSIZEARG="-b $((${ROOT_SIZE} / 8))"
|
|
|
|
USRSIZEARG="-b $((${USR_SIZE} / 8))"
|
|
|
|
HOMESIZEARG="-b $((${HOME_SIZE} / 8))"
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ ! -f ${BUILDSH} ]
|
|
|
|
then
|
|
|
|
echo "Please invoke me from the root source dir, where ${BUILDSH} is."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:${PATH}
|
2013-09-24 15:15:55 +02:00
|
|
|
|
2014-06-10 17:05:29 +02:00
|
|
|
#
|
|
|
|
# Are we going to build the minix sources?
|
|
|
|
#
|
|
|
|
|
|
|
|
if [ ${CREATE_IMAGE_ONLY} -eq 1 ]
|
|
|
|
then
|
|
|
|
if [ ! -d ${DESTDIR} ]
|
|
|
|
then
|
|
|
|
echo "Minix source code does'nt appear to have been built."
|
|
|
|
echo "Please try with \$CREATE_IMAGE_ONLY set to 0."
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2013-11-07 08:33:39 +01:00
|
|
|
#
|
|
|
|
# Artifacts from this script are stored in the IMG_DIR
|
|
|
|
#
|
2013-10-03 18:26:21 +02:00
|
|
|
rm -rf ${IMG_DIR} ${IMG}
|
|
|
|
mkdir -p ${IMG_DIR} ${CDFILES}
|
2013-11-07 08:33:39 +01:00
|
|
|
|
2014-06-10 17:05:29 +02:00
|
|
|
if [ ${CREATE_IMAGE_ONLY} -eq 0 ]
|
|
|
|
then
|
|
|
|
echo "Going to build Minix source code..."
|
|
|
|
#
|
|
|
|
# Remove the generated files to allow us call build.sh without '-V SLOPPY_FLIST=yes'.
|
|
|
|
#
|
|
|
|
rm -f ${FSTAB}
|
|
|
|
|
|
|
|
#
|
|
|
|
# Now start the build.
|
|
|
|
#
|
|
|
|
sh ${BUILDSH} -j ${JOBS} -m ${ARCH} -O ${OBJ} -D ${DESTDIR} ${BUILDVARS} -U -u distribution
|
2014-12-29 03:07:57 +01:00
|
|
|
else
|
|
|
|
${CROSS_TOOLS}/nbmake-i386 -C releasetools do-hdboot
|
2014-06-10 17:05:29 +02:00
|
|
|
fi
|
2013-09-24 15:15:55 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# create a fstab entry in /etc this is normally done during the
|
|
|
|
# setup phase on x86
|
|
|
|
#
|
|
|
|
cat >${FSTAB} <<END_FSTAB
|
Add PTYFS, Unix98 pseudo terminal support
This patch adds support for Unix98 pseudo terminals, that is,
posix_openpt(3), grantpt(3), unlockpt(3), /dev/ptmx, and /dev/pts/.
The latter is implemented with a new pseudo file system, PTYFS.
In effect, this patch adds secure support for unprivileged pseudo
terminal allocation, allowing programs such as tmux(1) to be used by
non-root users as well. Test77 has been extended with new tests, and
no longer needs to run as root.
The new functionality is optional. To revert to the old behavior,
remove the "ptyfs" entry from /etc/fstab.
Technical nodes:
o The reason for not implementing the NetBSD /dev/ptm approach is that
implementing the corresponding ioctl (TIOCPTMGET) would require
adding a number of extremely hairy exceptions to VFS, including the
PTY driver having to create new file descriptors for its own device
nodes.
o PTYFS is required for Unix98 PTYs in order to avoid that the PTY
driver has to be aware of old-style PTY naming schemes and even has
to call chmod(2) on a disk-backed file system. PTY cannot be its
own PTYFS since a character driver may currently not also be a file
system. However, PTYFS may be subsumed into a DEVFS in the future.
o The Unix98 PTY behavior differs somewhat from NetBSD's, in that
slave nodes are created on ptyfs only upon the first call to
grantpt(3). This approach obviates the need to revoke access as
part of the grantpt(3) call.
o Shutting down PTY may leave slave nodes on PTYFS, but once PTY is
restarted, these leftover slave nodes will be removed before they
create a security risk. Unmounting PTYFS will make existing PTY
slaves permanently unavailable, and absence of PTYFS will block
allocation of new Unix98 PTYs until PTYFS is (re)mounted.
Change-Id: I822b43ba32707c8815fd0f7d5bb7a438f51421c1
2015-06-22 19:14:34 +02:00
|
|
|
/dev/c0d0p2 /usr mfs rw 0 2
|
|
|
|
/dev/c0d0p3 /home mfs rw 0 2
|
|
|
|
none /sys devman rw,rslabel=devman 0 0
|
|
|
|
none /dev/pts ptyfs rw,rslabel=ptyfs 0 0
|
2013-09-24 15:15:55 +02:00
|
|
|
END_FSTAB
|
|
|
|
|
|
|
|
rm -f ${DESTDIR}/SETS.*
|
|
|
|
|
|
|
|
${CROSS_TOOLS}/nbpwd_mkdb -V 0 -p -d ${DESTDIR} ${DESTDIR}/etc/master.passwd
|
|
|
|
|
2013-10-03 18:26:21 +02:00
|
|
|
#
|
2013-09-24 15:15:55 +02:00
|
|
|
# make the different file system. this part is *also* hacky. We first convert
|
|
|
|
# the METALOG.sanitised using mtree into a input METALOG containing uids and
|
|
|
|
# gids.
|
2013-11-05 15:43:44 +01:00
|
|
|
# After that we do some magic processing to add device nodes (also missing from METALOG)
|
2013-09-24 15:15:55 +02:00
|
|
|
# and convert the METALOG into a proto file that can be used by mkfs.mfs
|
|
|
|
#
|
2014-08-08 14:05:25 +02:00
|
|
|
echo "Creating the file systems"
|
2013-09-24 15:15:55 +02:00
|
|
|
|
|
|
|
#
|
2013-11-05 15:43:44 +01:00
|
|
|
# read METALOG and use mtree to convert the user and group names into uid and gids
|
|
|
|
# FIX put "input somewhere clean"
|
2013-09-24 15:15:55 +02:00
|
|
|
#
|
2013-10-03 18:26:21 +02:00
|
|
|
cat ${DESTDIR}/METALOG.sanitised | ${CROSS_TOOLS}/nbmtree -N ${DESTDIR}/etc -C -K device > ${IMG_DIR}/input
|
2013-09-24 15:15:55 +02:00
|
|
|
|
2014-06-28 18:23:56 +02:00
|
|
|
# add rc (if any)
|
|
|
|
if [ -f ${RC} ]; then
|
|
|
|
cp ${RC} ${DESTDIR}/usr/etc/rc.local
|
|
|
|
echo "./usr/etc/rc.local type=file uid=0 gid=0 mode=0644" >> ${IMG_DIR}/input
|
|
|
|
fi
|
|
|
|
|
2013-09-24 15:15:55 +02:00
|
|
|
# add fstab
|
|
|
|
echo "./etc/fstab type=file uid=0 gid=0 mode=0755 size=747 time=1365060731.000000000" >> ${IMG_DIR}/input
|
|
|
|
|
Basic live rerandomization infrastructure
This commits adds a basic infrastructure to support Address Space
Randomization (ASR). In a nutshell, using the already imported ASR
LLVM pass, multiple versions can be generated for the same system
service, each with a randomized, different address space layout.
Combined with the magic instrumentation for state transfer, a system
service can be live updated into another ASR-randomized version at
runtime, thus providing live rerandomization.
Since MINIX3 is not yet capable of running LLVM linker passes, the
ASR-randomized service binaries have to be pregenerated during
crosscompilation. These pregenerated binaries can then be cycled
through at runtime. This patch provides the basic proof-of-concept
infrastructure for both these parts.
In order to support pregeneration, the clientctl host script has
been extended with a "buildasr" command. It is to be used after
building the entire system with bitcode and magic support, and will
produce a given number of ASR-randomized versions of all system
services. These services are placed in /usr/service/asr in the
image that is generated as final step by the "buildasr" command.
In order to support runtime updating, a new update_asr(8) command
has been added to MINIX3. This command attempts to live-update the
running system services into their next ASR-randomized versions.
For now, this command is not run automatically, and thus must be
invoked manually.
Technical notes:
- For various reasons, magic instrumentation is x86-only for now,
and ASR functionality is therefore to be used on x86 only as well.
- The ASR-randomized binaries are placed in numbered subdirectories
so as not to have to change their actual program names, which are
assumed to be static in various places (system.conf, procfs).
- The root partition is typically too small to contain all the
produced binaries, which is why we introduce /usr/service. There
is a symlink from /service/asr to /usr/service/asr for no other
reason than to let userland continue to assume that all services
are reachable through /service.
- The ASR count field (r_asr_count/ASRcount) maintained by RS is not
used within RS in any way; it is only passed through procfs to
userland in order to allow update_asr(8) to keep track of which
version is currently loaded without having to maintain own state.
- Ideally, pre-instrumentation linking of a service would remove all
its randomized versions. Currently, the user is assumed not to
perform ASR instrumentation and then recompile system services
without performing ASR instrumentation again, as the randomized
binaries included in the image would then be stale. This aspect
has to be improved later.
- Various other issues are flagged in the comments of the various
parts of this patch.
Change-Id: I093ad57f31c18305591f64b2d491272288aa0937
2015-09-06 08:06:24 +02:00
|
|
|
# add any generated ASR-randomized service binaries (but not their root directory, which is already there)
|
|
|
|
# TODO: apply stricter file permissions for both these and the base /service binaries, against local attacks
|
|
|
|
(cd ${DESTDIR} && find ./usr/service/asr -type d | sed '1d;s/$/ type=dir uid=0 gid=0 mode=0755/') >> ${IMG_DIR}/input
|
|
|
|
(cd ${DESTDIR} && find ./usr/service/asr -type f | sed 's/$/ type=file uid=0 gid=0 mode=0755/') >> ${IMG_DIR}/input
|
|
|
|
|
2013-09-24 15:15:55 +02:00
|
|
|
# fill root.img (skipping /usr entries while keeping the /usr directory)
|
2013-10-03 18:26:21 +02:00
|
|
|
cat ${IMG_DIR}/input | grep -v "^./usr/" | ${CROSS_TOOLS}/nbtoproto -b ${DESTDIR} -o ${IMG_DIR}/root.proto
|
2013-09-24 15:15:55 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# Create proto files for /usr and /home using toproto.
|
|
|
|
#
|
|
|
|
cat ${IMG_DIR}/input | grep "^\./usr/\|^. " | sed "s,\./usr,\.,g" | ${CROSS_TOOLS}/nbtoproto -b ${DESTDIR}/usr -o ${IMG_DIR}/usr.proto
|
|
|
|
cat ${IMG_DIR}/input | grep "^\./home/\|^. " | sed "s,\./home,\.,g" | ${CROSS_TOOLS}/nbtoproto -b ${DESTDIR}/home -o ${IMG_DIR}/home.proto
|
|
|
|
|
2013-10-03 18:26:21 +02:00
|
|
|
if [ "x${ISOMODE}" = "x1" ]
|
2014-08-08 14:05:25 +02:00
|
|
|
then
|
|
|
|
cp ${DESTDIR}/usr/mdec/boot_monitor ${CDFILES}/boot
|
|
|
|
cp ${MODDIR}/* ${CDFILES}/
|
|
|
|
. ${RELEASETOOLSDIR}/release.functions
|
|
|
|
cd_root_changes # uses $CDFILES and writes $CDFILES/boot.cfg
|
|
|
|
# start the image off with the iso image; reduce root size to reserve
|
|
|
|
${CROSS_TOOLS}/nbwriteisofs -s0x0 -l MINIX -B ${DESTDIR}/usr/mdec/bootxx_cd9660 -n ${CDFILES} ${IMG}
|
|
|
|
ISO_SIZE=$((`${CROSS_TOOLS}/nbstat -f %z ${IMG}` / 512))
|
|
|
|
else
|
|
|
|
# just make an empty iso partition
|
|
|
|
ISO_SIZE=8
|
2013-11-05 15:43:44 +01:00
|
|
|
fi
|
|
|
|
|
2013-10-03 18:26:21 +02:00
|
|
|
#
|
2014-08-08 14:05:25 +02:00
|
|
|
# Generate /root, /usr and /home partition images.
|
2013-10-03 18:26:21 +02:00
|
|
|
#
|
2014-08-08 14:05:25 +02:00
|
|
|
echo "Writing Minix filesystem images"
|
2013-10-03 18:26:21 +02:00
|
|
|
ROOT_START=${ISO_SIZE}
|
2013-11-07 08:33:39 +01:00
|
|
|
echo " - ROOT"
|
2014-08-08 14:05:25 +02:00
|
|
|
_ROOT_SIZE=$((`${CROSS_TOOLS}/nbmkfs.mfs -d ${ROOTSIZEARG} -I $((${ROOT_START}*512)) ${IMG} ${IMG_DIR}/root.proto`/512))
|
|
|
|
USR_START=$((${ROOT_START} + ${_ROOT_SIZE}))
|
2013-11-07 08:33:39 +01:00
|
|
|
echo " - USR"
|
2014-08-08 14:05:25 +02:00
|
|
|
_USR_SIZE=$((`${CROSS_TOOLS}/nbmkfs.mfs -d ${USRSIZEARG} -I $((${USR_START}*512)) ${IMG} ${IMG_DIR}/usr.proto`/512))
|
|
|
|
HOME_START=$((${USR_START} + ${_USR_SIZE}))
|
2013-11-07 08:33:39 +01:00
|
|
|
echo " - HOME"
|
2014-08-08 14:05:25 +02:00
|
|
|
_HOME_SIZE=$((`${CROSS_TOOLS}/nbmkfs.mfs -d ${HOMESIZEARG} -I $((${HOME_START}*512)) ${IMG} ${IMG_DIR}/home.proto`/512))
|
2013-09-24 15:15:55 +02:00
|
|
|
|
2014-08-08 14:05:25 +02:00
|
|
|
#
|
|
|
|
# Write the partition table using the natively compiled
|
|
|
|
# minix partition utility
|
|
|
|
#
|
|
|
|
${CROSS_TOOLS}/nbpartition -m ${IMG} 0 81:${ISO_SIZE} \
|
|
|
|
81:${_ROOT_SIZE} 81:${_USR_SIZE} 81:${_HOME_SIZE}
|
2013-09-24 15:15:55 +02:00
|
|
|
|
2013-10-03 18:26:21 +02:00
|
|
|
mods="`( cd ${MODDIR}; echo mod* | tr ' ' ',' )`"
|
|
|
|
if [ "x${ISOMODE}" = "x1" ]
|
|
|
|
then
|
|
|
|
echo "CD image at `pwd`/${IMG}"
|
|
|
|
else
|
|
|
|
echo "To boot this image on kvm:"
|
2015-01-23 18:30:39 +01:00
|
|
|
echo "cd ${MODDIR} && qemu-system-i386 --enable-kvm -m 256 -kernel kernel -append \"rootdevname=c0d0p1\" -initrd \"${mods}\" -hda `pwd`/${IMG}"
|
2013-11-05 15:43:44 +01:00
|
|
|
fi
|