3 files changed, 34 insertions, 1 deletions

diff --git a/block/bsg.c b/block/bsg.c
index e8bd2475682a..e73e50daf3d0 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -202,6 +202,8 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
                 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
+        if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+                rq->timeout = BLK_MIN_SG_TIMEOUT;
 
         return 0;
 }
diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 3d3e7a46f38c..67eb93cff699 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -677,6 +677,29 @@ static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
         case DVD_WRITE_STRUCT:
         case DVD_AUTH:
                 arg = (unsigned long)compat_ptr(arg);
+        /* These intepret arg as an unsigned long, not as a pointer,
+         * so we must not do compat_ptr() conversion. */
+        case HDIO_SET_MULTCOUNT:
+        case HDIO_SET_UNMASKINTR:
+        case HDIO_SET_KEEPSETTINGS:
+        case HDIO_SET_32BIT:
+        case HDIO_SET_NOWERR:
+        case HDIO_SET_DMA:
+        case HDIO_SET_PIO_MODE:
+        case HDIO_SET_NICE:
+        case HDIO_SET_WCACHE:
+        case HDIO_SET_ACOUSTIC:
+        case HDIO_SET_BUSSTATE:
+        case HDIO_SET_ADDRESS:
+        case CDROMEJECT_SW:
+        case CDROM_SET_OPTIONS:
+        case CDROM_CLEAR_OPTIONS:
+        case CDROM_SELECT_SPEED:
+        case CDROM_SELECT_DISC:
+        case CDROM_MEDIA_CHANGED:
+        case CDROM_DRIVE_STATUS:
+        case CDROM_LOCKDOOR:
+        case CDROM_DEBUG:
                 break;
         default:
                 /* unknown ioctl number */
@@ -699,8 +722,14 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
         struct backing_dev_info *bdi;
         loff_t size;
 
+        /*
+         * O_NDELAY can be altered using fcntl(.., F_SETFL, ..), so we have
+         * to updated it before every ioctl.
+         */
         if (file->f_flags & O_NDELAY)
-                mode |= FMODE_NDELAY_NOW;
+                mode |= FMODE_NDELAY;
+        else
+                mode &= ~FMODE_NDELAY;
 
         switch (cmd) {
         case HDIO_GETGEO:
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 5963cf91a3a0..d0bb92cbefb9 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -208,6 +208,8 @@ static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
                 rq->timeout = q->sg_timeout;
         if (!rq->timeout)
                 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;
+        if (rq->timeout < BLK_MIN_SG_TIMEOUT)
+                rq->timeout = BLK_MIN_SG_TIMEOUT;
 
         return 0;
 }