diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2022-04-28 01:39:50 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-07-25 21:00:19 +0000 |
| commit | db8082886fd8cfbd8a3d533bb530ad392d0c4d85 (patch) | |
| tree | c7f8fadc56c8f84a395bb571db12aff0f51fffea | |
| parent | fc952ac2212b121aa6eefc273f5960ec3e0a466d (diff) | |
| download | src-db8082886fd8.tar.gz src-db8082886fd8.zip | |
CAM: Keep periph_links when restoring CCB in camperiphdone().
While recovery command executed, some other commands from the periph
may complete, that may affect periph_links of this CCB. So restoring
original CCB we must keep current periph_links as more up to date.
I've found this triggering assertions with debug kernel and suspect
some memory corruptions otherwise when spun down disk receives two
or sometimes more concurrent requests.
Approved by: so
Security: FreeBSD-EN22:17.cam
MFC after: 1 week
Sponsored by: iXsystems, Inc.
(cherry picked from commit 404f001161b975164d8b52d9f404d07ac7584027)
(cherry picked from commit 84849cfd1dc016917402511bc5a55d3d7317ce39)
| -rw-r--r-- | sys/cam/cam_periph.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index d08adca0ea1c..9a4f4a2b160b 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1421,6 +1421,7 @@ camperiphdone(struct cam_periph *periph, union ccb *done_ccb) * and the result will be the final one returned to the CCB owher. */ saved_ccb = (union ccb *)done_ccb->ccb_h.saved_ccb_ptr; + saved_ccb->ccb_h.periph_links = done_ccb->ccb_h.periph_links; bcopy(saved_ccb, done_ccb, sizeof(*done_ccb)); xpt_free_ccb(saved_ccb); if (done_ccb->ccb_h.cbfcnp != camperiphdone) |