Module Name: src
Committed By: nonaka
Date: Thu Sep 8 04:41:16 UTC 2016
Modified Files:
src/sys/dev/ic: nvme.c
Log Message:
fix off-by-one error in namespace id range check.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/nvme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.3 src/sys/dev/ic/nvme.c:1.4
--- src/sys/dev/ic/nvme.c:1.3 Sat Jun 4 16:11:51 2016
+++ src/sys/dev/ic/nvme.c Thu Sep 8 04:41:16 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.3 2016/06/04 16:11:51 nonaka Exp $ */
+/* $NetBSD: nvme.c,v 1.4 2016/09/08 04:41:16 nonaka Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.3 2016/06/04 16:11:51 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.4 2016/09/08 04:41:16 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1559,7 +1559,7 @@ nvmensopen(dev_t dev, int flag, int mode
return ENXIO;
nsidx = nsid - 1;
- if (nsidx > sc->sc_nn || sc->sc_namespaces[nsidx].dev == NULL)
+ if (nsidx >= sc->sc_nn || sc->sc_namespaces[nsidx].dev == NULL)
return ENXIO;
if (ISSET(sc->sc_namespaces[nsidx].flags, NVME_NS_F_OPEN))
return EBUSY;
@@ -1586,7 +1586,7 @@ nvmensclose(dev_t dev, int flag, int mod
return ENXIO;
nsidx = nsid - 1;
- if (nsidx > sc->sc_nn)
+ if (nsidx >= sc->sc_nn)
return ENXIO;
CLR(sc->sc_namespaces[nsidx].flags, NVME_NS_F_OPEN);
