1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index b70d6e103a57..671a0ae434b4 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3380,7 +3380,8 @@ static int fd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static bool valid_floppy_drive_params(const short autodetect[8])
+static bool valid_floppy_drive_params(const short autodetect[8],
+                int native_format)
 {
         size_t floppy_type_size = ARRAY_SIZE(floppy_type);
         size_t i = 0;
@@ -3391,6 +3392,9 @@ static bool valid_floppy_drive_params(const short autodetect[8])
                         return false;
         }
 
+        if (native_format < 0 || native_format >= floppy_type_size)
+                return false;
+
         return true;
 }
 
@@ -3520,7 +3524,8 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
                 SUPBOUND(size, strlen((const char *)outparam) + 1);
                 break;
         case FDSETDRVPRM:
-                if (!valid_floppy_drive_params(inparam.dp.autodetect))
+                if (!valid_floppy_drive_params(inparam.dp.autodetect,
+                                inparam.dp.native_format))
                         return -EINVAL;
                 *UDP = inparam.dp;
                 break;
@@ -3719,7 +3724,7 @@ static int compat_setdrvprm(int drive,
                 return -EPERM;
         if (copy_from_user(&v, arg, sizeof(struct compat_floppy_drive_params)))
                 return -EFAULT;
-        if (!valid_floppy_drive_params(v.autodetect))
+        if (!valid_floppy_drive_params(v.autodetect, v.native_format))
                 return -EINVAL;
         mutex_lock(&floppy_mutex);
         UDP->cmos = v.cmos;