Skip to contentSkip to conversation

sg: Free data buffers after calling blk_rq_unmap_user

PATCH Christof Schmitt 2 participants 3 messages Sep 15, 2009 – Sep 17, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

This patch fixes a problem with the sg driver that is only visible with the CONFIG_DEBUG_PAGEALLOC kernel config option. The patch works for me, but i would appreciate the review of somebody with more knowledge about the interactions between the sg driver and the block layer.

Christof
---
sg: Free data buffers after calling blk_rq_unmap_user

From: Christof Schmitt <[email protected]>

Running sg_luns on s390x with CONFIG_DEBUG_PAGEALLOC enabled fails with EFAULT from the SG_IO ioctl. The EFAULT is the result from copy_to_user failing in this call chain:

sg_ioctl
sg_new_read
sg_finish_rem_req
blk_rq_unmap_user
__blk_rq_unmap_user
bio_uncopy_user
__bio_copy_iov
copy_to_user

The sg driver calls sg_remove_scat to free the memory pages before calling blk_rq_unmap_user that tries to copy the data back to userspace. Change the order to first call blk_rq_unmap_user before freeing the pages in sg_remove_scat.

---
 drivers/scsi/sg.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/sg.c +5 -5
@@ -1708,11 +1708,6 @@ static int sg_finish_rem_req(Sg_request 
 	Sg_scatter_hold *req_schp = &srp->data;
 
 	SCSI_LOG_TIMEOUT(4, printk("sg_finish_rem_req: res_used=%d\n", (int) srp->res_used));
-	if (srp->res_used)
-		sg_unlink_reserve(sfp, srp);
-	else
-		sg_remove_scat(req_schp);
-
 	if (srp->rq) {
 		if (srp->bio)
 			ret = blk_rq_unmap_user(srp->bio);
@@ -1720,6 +1715,11 @@ static int sg_finish_rem_req(Sg_request 
 		blk_put_request(srp->rq);
 	}
 
+	if (srp->res_used)
+		sg_unlink_reserve(sfp, srp);
+	else
+		sg_remove_scat(req_schp);
+
 	sg_remove_request(sfp, srp);
 
 	return ret;
#1 lore raw

Sorry for the delay,

Quoted 30 lines · On Tue, 15 Sep 2009 18:53:57 +0200 Christof Schmitt…

This patch fixes a problem with the sg driver that is only visible with the CONFIG_DEBUG_PAGEALLOC kernel config option. The patch works for me, but i would appreciate the review of somebody with more knowledge about the interactions between the sg driver and the block layer.

Christof
---
sg: Free data buffers after calling blk_rq_unmap_user

From: Christof Schmitt <[email protected]>

Running sg_luns on s390x with CONFIG_DEBUG_PAGEALLOC enabled fails with EFAULT from the SG_IO ioctl. The EFAULT is the result from copy_to_user failing in this call chain:

sg_ioctl
sg_new_read
sg_finish_rem_req
blk_rq_unmap_user
__blk_rq_unmap_user
bio_uncopy_user
__bio_copy_iov
copy_to_user

The sg driver calls sg_remove_scat to free the memory pages before calling blk_rq_unmap_user that tries to copy the data back to userspace. Change the order to first call blk_rq_unmap_user before freeing the pages in sg_remove_scat.

Quoted 4 lines
---
 drivers/scsi/sg.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Oops, thanks a lot!

It would be better to add "Cc: [email protected]" tag since this fix needs to be sent to stable trees.

#2 lore raw
Quoted 40 lines · FUJITA Tomonori

Sorry for the delay,

Quoted 30 lines · On Tue, 15 Sep 2009 18:53:57 +0200 Christof Schmitt…

This patch fixes a problem with the sg driver that is only visible with the CONFIG_DEBUG_PAGEALLOC kernel config option. The patch works for me, but i would appreciate the review of somebody with more knowledge about the interactions between the sg driver and the block layer.

Christof
---
sg: Free data buffers after calling blk_rq_unmap_user

From: Christof Schmitt <[email protected]>

Running sg_luns on s390x with CONFIG_DEBUG_PAGEALLOC enabled fails with EFAULT from the SG_IO ioctl. The EFAULT is the result from copy_to_user failing in this call chain:

sg_ioctl
sg_new_read
sg_finish_rem_req
blk_rq_unmap_user
__blk_rq_unmap_user
bio_uncopy_user
__bio_copy_iov
copy_to_user

The sg driver calls sg_remove_scat to free the memory pages before calling blk_rq_unmap_user that tries to copy the data back to userspace. Change the order to first call blk_rq_unmap_user before freeing the pages in sg_remove_scat.

Quoted 4 lines
---
 drivers/scsi/sg.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 6 lines

Oops, thanks a lot!

It would be better to add "Cc: [email protected]" tag since this fix needs to be sent to stable trees.

Thanks for the review. I will resend the patch with the added acked-by and cc.

--
Christof