summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2015-03-04 23:52:43 +0000
committerdlg <dlg@openbsd.org>2015-03-04 23:52:43 +0000
commit12db79ca8f582f6bd151ea8214bfb24f4732dc9a (patch)
treeddf6c389658c7ba2a6db18949763521a47b5eb3a
parentmake these work with !SSH1; ok markus@ deraadt@ (diff)
downloadwireguard-openbsd-12db79ca8f582f6bd151ea8214bfb24f4732dc9a.tar.xz
wireguard-openbsd-12db79ca8f582f6bd151ea8214bfb24f4732dc9a.zip
prevent umass devices from being considered for paths.
ok deraadt@
-rw-r--r--sys/scsi/mpath.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c
index 177758eccc4..ca2e9a9f1bf 100644
--- a/sys/scsi/mpath.c
+++ b/sys/scsi/mpath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpath.c,v 1.37 2014/09/14 14:17:26 jsg Exp $ */
+/* $OpenBSD: mpath.c,v 1.38 2015/03/04 23:52:43 dlg Exp $ */
/*
* Copyright (c) 2009 David Gwynne <dlg@openbsd.org>
@@ -427,6 +427,9 @@ mpath_path_probe(struct scsi_link *link)
if (link->id == NULL)
return (EINVAL);
+ if (ISSET(link->flags, SDEV_UMASS))
+ return (EINVAL);
+
if (mpath == link->adapter_softc)
return (ENXIO);