aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/enclosure.h
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 /include/linux/enclosure.h
parentc982c368bb90adbd312faa05d0cfd842e9ab45a7 (diff)
downloadkernel_samsung_smdk4412-cc9b2e9f6603190c009e5d2629ce8e3f99571346.zip
kernel_samsung_smdk4412-cc9b2e9f6603190c009e5d2629ce8e3f99571346.tar.gz
kernel_samsung_smdk4412-cc9b2e9f6603190c009e5d2629ce8e3f99571346.tar.bz2
[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 'include/linux/enclosure.h')
-rw-r--r--include/linux/enclosure.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 90d1c21..9a33c5f 100644
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -42,6 +42,8 @@ enum enclosure_status {
ENCLOSURE_STATUS_NOT_INSTALLED,
ENCLOSURE_STATUS_UNKNOWN,
ENCLOSURE_STATUS_UNAVAILABLE,
+ /* last element for counting purposes */
+ ENCLOSURE_STATUS_MAX
};
/* SFF-8485 activity light settings */