diff --git a/[refs] b/[refs]
index 2d3cdedc4936..4522192e67eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 916d4d672779de8e42346fff338617c7b841e8e5
+refs/heads/master: aedfec59eed37d1ff7ce09b303b668234e9a7f8e
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index 0d80967e140c..d833d02b321f 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1721,7 +1721,8 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 	if (!disk)
 		goto out;
 
-	sprintf(disk->disk_name, DRV_NAME "%d", rbd_dev->id);
+	snprintf(disk->disk_name, sizeof(disk->disk_name), DRV_NAME "%d",
+		 rbd_dev->id);
 	disk->major = rbd_dev->major;
 	disk->first_minor = 0;
 	disk->fops = &rbd_bd_ops;