diff options
| author |   James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-11 09:16:38 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-11 11:05:57 -0800 |
| commit | 5e1033561da1152c57b97ee84371dba2b3d64c25 (patch) | |
| tree | abae723dc0851525794fcfa5d75691fbdb33ff09 /include/linux/enclosure.h | |
| parent | ses: Fix problems with simple enclosures (diff) | |
| download | linux-dev-5e1033561da1152c57b97ee84371dba2b3d64c25.tar.xz linux-dev-5e1033561da1152c57b97ee84371dba2b3d64c25.zip | |
ses: fix additional element traversal bug
KASAN found that our additional element processing scripts drop off
the end of the VPD page into unallocated space. The reason is that
not every element has additional information but our traversal
routines think they do, leading to them expecting far more additional
information than is present. Fix this by adding a gate to the
traversal routine so that it only processes elements that are expected
to have additional information (list is in SES-2 section 6.1.13.1:
Additional Element Status diagnostic page overview)
Reported-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Tested-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'include/linux/enclosure.h')
| -rw-r--r-- | include/linux/enclosure.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h index 7be22da321f3..a4cf57cd0f75 100644 --- a/include/linux/enclosure.h +++ b/include/linux/enclosure.h @@ -29,7 +29,11 @@ /* A few generic types ... taken from ses-2 */ enum enclosure_component_type { ENCLOSURE_COMPONENT_DEVICE = 0x01, + ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS = 0x07, + ENCLOSURE_COMPONENT_SCSI_TARGET_PORT = 0x14, + ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT = 0x15, ENCLOSURE_COMPONENT_ARRAY_DEVICE = 0x17, + ENCLOSURE_COMPONENT_SAS_EXPANDER = 0x18, }; /* ses-2 common element status */ |