Commit c06bb7f5 authored Mar 28, 2006 by Douglas Gilbert Committed by James Bottomley Apr 13, 2006

[SCSI] sg: fix leak when dio setup fails

when the sg driver is unable to setup direct IO, free that scatter
gather list prior to falling back to indirect IO

Further to this thread started by Bryan Holty:
http://marc.theaimsgroup.com/?l=linux-scsi&m=114306885116728&w=2



Here is the reworked patch again. This time it has been
tested with a program provided by Bryan.

Signed-off-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent d6159c17

drivers/scsi/sg.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1799,8 +1799,10 @@ sg_build_direct(Sg_request * srp, Sg_fd * sfp, int dxfer_len)
		res = st_map_user_pages(schp->buffer, mx_sc_elems,
		(unsigned long)hp->dxferp, dxfer_len,
		(SG_DXFER_TO_DEV == hp->dxfer_direction) ? 1 : 0);
		if (res <= 0)
		if (res <= 0) {
		sg_remove_scat(schp);
		return 1;
		}
		schp->k_use_sg = res;
		schp->dio_in_use = 1;
		hp->info \|= SG_INFO_DIRECT_IO;

Admin message