Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad7f01e authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

sg: set dxferp to NULL for READ with the older SG interface 



With the older SG interface, we don't know a user-space address to
trasfer data when executing a SCSI command. So we can't pass a
user-space address to blk_rq_map_user.

This patch fixes sg to pass a NULL user-space address to
blk_rq_map_user so that it just sets up a request and bios with page
frames propely without data transfer.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 81882766

drivers/scsi/sg.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,10 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos) 
	else

	else

		hp->dxfer_direction = (mxsize > 0) ? SG_DXFER_FROM_DEV : SG_DXFER_NONE;

		hp->dxfer_direction = (mxsize > 0) ? SG_DXFER_FROM_DEV : SG_DXFER_NONE;

	hp->dxfer_len = mxsize;

	hp->dxfer_len = mxsize;

	if (hp->dxfer_direction == SG_DXFER_TO_DEV)

		hp->dxferp = (char __user *)buf + cmd_size;

		hp->dxferp = (char __user *)buf + cmd_size;

	else

		hp->dxferp = NULL;

	hp->sbp = NULL;

	hp->sbp = NULL;

	hp->timeout = old_hdr.reply_len;	/* structure abuse ... */

	hp->timeout = old_hdr.reply_len;	/* structure abuse ... */

	hp->flags = input_size;	/* structure abuse ... */

	hp->flags = input_size;	/* structure abuse ... */