2 files changed, 2 insertions, 1 deletions

diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
index 7c668c8a6f95..7e5d474dc6ba 100644
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
@@ -59,6 +59,7 @@ static int compat_hdio_getgeo(struct gendisk *disk, struct block_device *bdev,
         if (!disk->fops->getgeo)
                 return -ENOTTY;
 
+        memset(&geo, 0, sizeof(geo));
         /*
          * We need to set the startsect first, the driver may
          * want to override it.
diff --git a/block/genhd.c b/block/genhd.c
index e9094b375c05..dadf42b454a3 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -512,7 +512,7 @@ static void register_disk(struct gendisk *disk)
 
         ddev->parent = disk->driverfs_dev;
 
-        dev_set_name(ddev, disk->disk_name);
+        dev_set_name(ddev, "%s", disk->disk_name);
 
         /* delay uevents, until we scanned partition table */
         dev_set_uevent_suppress(ddev, 1);