Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F145285620
D8477.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D8477.diff
View Options
Index: head/sys/cam/cam_xpt.c
===================================================================
--- head/sys/cam/cam_xpt.c
+++ head/sys/cam/cam_xpt.c
@@ -414,6 +414,10 @@
struct cam_eb *bus;
inccb = (union ccb *)addr;
+#if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING)
+ if (inccb->ccb_h.func_code == XPT_SCSI_IO)
+ inccb->csio.bio = NULL;
+#endif
bus = xpt_find_bus(inccb->ccb_h.path_id);
if (bus == NULL)
@@ -593,6 +597,10 @@
unit = ccb->cgdl.unit_number;
name = ccb->cgdl.periph_name;
base_periph_found = 0;
+#if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING)
+ if (ccb->ccb_h.func_code == XPT_SCSI_IO)
+ ccb->csio.bio = NULL;
+#endif
/*
* Sanity check -- make sure we don't get a null peripheral
Index: head/sys/cam/scsi/scsi_pass.c
===================================================================
--- head/sys/cam/scsi/scsi_pass.c
+++ head/sys/cam/scsi/scsi_pass.c
@@ -1777,6 +1777,10 @@
int ccb_malloced;
inccb = (union ccb *)addr;
+#if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING)
+ if (inccb->ccb_h.func_code == XPT_SCSI_IO)
+ inccb->csio.bio = NULL;
+#endif
/*
* Some CCB types, like scan bus and scan lun can only go
@@ -1875,6 +1879,10 @@
cam_periph_lock(periph);
break;
}
+#if defined(BUF_TRACKING) || defined(FULL_BUF_TRACKING)
+ if (ccb->ccb_h.func_code == XPT_SCSI_IO)
+ ccb->csio.bio = NULL;
+#endif
if (ccb->ccb_h.flags & CAM_CDB_POINTER) {
if (ccb->csio.cdb_len > IOCDBLEN) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Feb 19, 12:21 AM (5 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28860999
Default Alt Text
D8477.diff (1 KB)
Attached To
Mode
D8477: cam: Zero bio pointer in user-supplied SCSI CCBs
Attached
Detach File
Event Timeline
Log In to Comment