mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

Mask disk_idx to avoid panic because of extra bits set.

Browse Source 
PR:		kern/102211
Submitted by:	yoichi
This commit is contained in:
Alexander Motin 2010-03-12 07:49:10 +00:00
parent 65c712c0d7
commit 2d6d3b6d73
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=205074
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ata/ata-raid.c
View File

@ -2544,22 +2544,24 @@ ata_raid_intel_read_meta(device_t dev, struct ar_softc **raidp)
/* clear out any old info */ /* clear out any old info */
for (disk = 0; disk < raid->total_disks; disk++) { for (disk = 0; disk < raid->total_disks; disk++) {
u_int disk_idx = map->disk_idx[disk] & 0xffff;
raid->disks[disk].dev = NULL; raid->disks[disk].dev = NULL;
bcopy(meta->disk[map->disk_idx[disk]].serial, bcopy(meta->disk[disk_idx].serial,
raid->disks[disk].serial, raid->disks[disk].serial,
sizeof(raid->disks[disk].serial)); sizeof(raid->disks[disk].serial));
raid->disks[disk].sectors = raid->disks[disk].sectors =
meta->disk[map->disk_idx[disk]].sectors; meta->disk[disk_idx].sectors;
raid->disks[disk].flags = 0; raid->disks[disk].flags = 0;
if (meta->disk[map->disk_idx[disk]].flags & INTEL_F_ONLINE) if (meta->disk[disk_idx].flags & INTEL_F_ONLINE)
raid->disks[disk].flags |= AR_DF_ONLINE; raid->disks[disk].flags |= AR_DF_ONLINE;
if (meta->disk[map->disk_idx[disk]].flags & INTEL_F_ASSIGNED) if (meta->disk[disk_idx].flags & INTEL_F_ASSIGNED)
raid->disks[disk].flags |= AR_DF_ASSIGNED; raid->disks[disk].flags |= AR_DF_ASSIGNED;
if (meta->disk[map->disk_idx[disk]].flags & INTEL_F_SPARE) { if (meta->disk[disk_idx].flags & INTEL_F_SPARE) {
raid->disks[disk].flags &= ~(AR_DF_ONLINE | AR_DF_ASSIGNED); raid->disks[disk].flags &= ~(AR_DF_ONLINE | AR_DF_ASSIGNED);
raid->disks[disk].flags |= AR_DF_SPARE; raid->disks[disk].flags |= AR_DF_SPARE;
} }
if (meta->disk[map->disk_idx[disk]].flags & INTEL_F_DOWN) if (meta->disk[disk_idx].flags & INTEL_F_DOWN)
raid->disks[disk].flags &= ~AR_DF_ONLINE; raid->disks[disk].flags &= ~AR_DF_ONLINE;
} }
} }