|
@@ -751,35 +751,6 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static bool sg_is_valid_dxfer(sg_io_hdr_t *hp)
|
|
|
-{
|
|
|
- switch (hp->dxfer_direction) {
|
|
|
- case SG_DXFER_NONE:
|
|
|
- if (hp->dxferp || hp->dxfer_len > 0)
|
|
|
- return false;
|
|
|
- return true;
|
|
|
- case SG_DXFER_FROM_DEV:
|
|
|
- /*
|
|
|
- * for SG_DXFER_FROM_DEV we always set dxfer_len to > 0. dxferp
|
|
|
- * can either be NULL or != NULL so there's no point in checking
|
|
|
- * it either. So just return true.
|
|
|
- */
|
|
|
- return true;
|
|
|
- case SG_DXFER_TO_DEV:
|
|
|
- case SG_DXFER_TO_FROM_DEV:
|
|
|
- if (!hp->dxferp || hp->dxfer_len == 0)
|
|
|
- return false;
|
|
|
- return true;
|
|
|
- case SG_DXFER_UNKNOWN:
|
|
|
- if ((!hp->dxferp && hp->dxfer_len) ||
|
|
|
- (hp->dxferp && hp->dxfer_len == 0))
|
|
|
- return false;
|
|
|
- return true;
|
|
|
- default:
|
|
|
- return false;
|
|
|
- }
|
|
|
-}
|
|
|
-
|
|
|
static int
|
|
|
sg_common_write(Sg_fd * sfp, Sg_request * srp,
|
|
|
unsigned char *cmnd, int timeout, int blocking)
|
|
@@ -800,7 +771,7 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
|
|
|
"sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n",
|
|
|
(int) cmnd[0], (int) hp->cmd_len));
|
|
|
|
|
|
- if (!sg_is_valid_dxfer(hp))
|
|
|
+ if (hp->dxfer_len >= SZ_256M)
|
|
|
return -EINVAL;
|
|
|
|
|
|
k = sg_start_req(srp, cmnd);
|