1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 671a0ae434b4..fee57f7f3821 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3233,8 +3233,10 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g,
         int cnt;
 
         /* sanity checking for parameters. */
-        if (g->sect <= 0 ||
-            g->head <= 0 ||
+        if ((int)g->sect <= 0 ||
+            (int)g->head <= 0 ||
+            /* check for overflow in max_sector */
+            (int)(g->sect * g->head) <= 0 ||
             /* check for zero in F_SECT_PER_TRACK */
             (unsigned char)((g->sect << 2) >> FD_SIZECODE(g)) == 0 ||
             g->track <= 0 || g->track > UDP->tracks >> STRETCH(g) ||