d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reject attempts to attack a disk device that has the old NEEDSGIANT

Browse Source 
flag set.

Reviewed by:	mav
This commit is contained in:
jhb 2013-10-25 19:19:12 +00:00
parent 4469fbfd43
commit b132568f90
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/geom/geom_disk.c
View File

@ -657,6 +657,13 @@ disk_create(struct disk *dp, int version)
dp->d_name, dp->d_unit);
return;
}
if (dp->d_flags & DISKFLAG_RESERVED) {
printf("WARNING: Attempt to add non-MPSAFE disk %s%d\n",
dp->d_name, dp->d_unit);
printf("WARNING: Ignoring disk %s%d\n",
dp->d_name, dp->d_unit);
return;
}
KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy"));
KASSERT(dp->d_name != NULL, ("disk_create need d_name"));
KASSERT(*dp->d_name != 0, ("disk_create need d_name"));

1
sys/geom/geom_disk.h
View File

@ -103,6 +103,7 @@ struct disk {
void *d_drv1;
};
#define DISKFLAG_RESERVED 0x1 /* Was NEEDSGIANT */
#define DISKFLAG_OPEN 0x2
#define DISKFLAG_CANDELETE 0x4
#define DISKFLAG_CANFLUSHCACHE 0x8