git: cd7c996c4ed9 - releng/12.3 - CAM: Keep periph_links when restoring CCB in camperiphdone().
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 09 Aug 2022 19:58:52 UTC
The branch releng/12.3 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd7c996c4ed94c195e14e33e6173e91e5bbc6f29 commit cd7c996c4ed94c195e14e33e6173e91e5bbc6f29 Author: Alexander Motin <mav@FreeBSD.org> AuthorDate: 2022-04-28 01:39:50 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2022-07-25 20:06:40 +0000 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-EN-22:17.cam MFC after: 1 week Sponsored by: iXsystems, Inc. (cherry picked from commit 404f001161b975164d8b52d9f404d07ac7584027) (cherry picked from commit 8dab6aba5f6ee635e4ff3f313d0209af718ea42f) --- sys/cam/cam_periph.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index c53be6d61fa7..30423f4d72a0 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1440,6 +1440,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)