summaryrefslogtreecommitdiffstats
path: root/drivers/misc/enclosure.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2009-11-26 09:50:20 -0600
committerJames Bottomley <James.Bottomley@suse.de>2009-12-10 08:54:14 -0600
commitcc9b2e9f6603190c009e5d2629ce8e3f99571346 (patch)
tree922a81bd0d58261927da86342f005201cc1087a5 /drivers/misc/enclosure.c
parentc982c368bb90adbd312faa05d0cfd842e9ab45a7 (diff)
downloadlinux-cc9b2e9f6603190c009e5d2629ce8e3f99571346.tar.gz
linux-cc9b2e9f6603190c009e5d2629ce8e3f99571346.tar.bz2
linux-cc9b2e9f6603190c009e5d2629ce8e3f99571346.zip
[SCSI] enclosure: fix oops while iterating enclosure_status array
Based on patch originally by Jeff Mahoney <jeffm@suse.com> enclosure_status is expected to be a NULL terminated array of strings but isn't actually NULL terminated. When writing an invalid value to /sys/class/enclosure/.../.../status, it goes off the end of the array and Oopses. Fix by making the assumption true and adding NULL at the end. Reported-by: Artur Wojcik <artur.wojcik@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/misc/enclosure.c')
-rw-r--r--drivers/misc/enclosure.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index e9eae4a78402..1eac626e710a 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -391,6 +391,7 @@ static const char *const enclosure_status [] = {
[ENCLOSURE_STATUS_NOT_INSTALLED] = "not installed",
[ENCLOSURE_STATUS_UNKNOWN] = "unknown",
[ENCLOSURE_STATUS_UNAVAILABLE] = "unavailable",
+ [ENCLOSURE_STATUS_MAX] = NULL,
};
static const char *const enclosure_type [] = {