---

yaml --- r: 110516 b: refs/heads/master c: fad7f01 h: refs/heads/master v: v3
git-mirror · Oct 9, 2008 · 3c661ea · 3c661ea
1 parent 744ed94
commit 3c661ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 818827669d85b84241696ffef2de485db46b0b5e
+refs/heads/master: fad7f01e61bf737fe8a3740d803f000db57ecac6
diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c
@@ -615,7 +615,10 @@ sg_write(struct file *filp, const char __user *buf, size_t count, loff_t * ppos)
 	else
 		hp->dxfer_direction = (mxsize > 0) ? SG_DXFER_FROM_DEV : SG_DXFER_NONE;
 	hp->dxfer_len = mxsize;
-	hp->dxferp = (char __user *)buf + cmd_size;
+	if (hp->dxfer_direction == SG_DXFER_TO_DEV)
+		hp->dxferp = (char __user *)buf + cmd_size;
+	else
+		hp->dxferp = NULL;
 	hp->sbp = NULL;
 	hp->timeout = old_hdr.reply_len;	/* structure abuse ... */
 	hp->flags = input_size;	/* structure abuse ... */