From b57dec73f79ba342969fb41ecdbe00b39b015b08 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 30 Apr 2010 11:06:56 -0700 Subject: [PATCH] kernel - Disallow dsioctl when no media is present * Attempt to fix a panic which can occur when attempts are made to call ioctl() via a slice/partition on removable drives with no media. --- sys/kern/subr_diskslice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 47d9256547..931178dd78 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -389,6 +389,8 @@ dsioctl(cdev_t dev, u_long cmd, caddr_t data, int flags, slice = dkslice(dev); part = dkpart(dev); ssp = *sspp; + if (ssp == NULL) + return (EINVAL); if (slice >= ssp->dss_nslices) return (EINVAL); sp = &ssp->dss_slices[slice]; -- 2.41.0