]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
lightnvm: convert sprintf into strlcpy
authorJavier González <jg@lightnvm.io>
Sat, 15 Apr 2017 18:55:49 +0000 (20:55 +0200)
committerJens Axboe <axboe@fb.com>
Sun, 16 Apr 2017 16:06:25 +0000 (10:06 -0600)
Convert sprintf calls to strlcpy in order to make possible buffer
overflow more obvious.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/lightnvm/core.c

index 258007a6bc313a5ad429e9c49aa40603be8d34fc..2c26af3d4ba89aa06ea5a2434d65a6a66d923923 100644 (file)
@@ -273,7 +273,7 @@ static int nvm_create_tgt(struct nvm_dev *dev, struct nvm_ioctl_create *create)
                goto err_disk;
        blk_queue_make_request(tqueue, tt->make_rq);
 
-       sprintf(tdisk->disk_name, "%s", create->tgtname);
+       strlcpy(tdisk->disk_name, create->tgtname, sizeof(tdisk->disk_name));
        tdisk->flags = GENHD_FL_EXT_DEVT;
        tdisk->major = 0;
        tdisk->first_minor = 0;
@@ -1198,13 +1198,13 @@ static long nvm_ioctl_get_devices(struct file *file, void __user *arg)
        list_for_each_entry(dev, &nvm_devices, devices) {
                struct nvm_ioctl_device_info *info = &devices->info[i];
 
-               sprintf(info->devname, "%s", dev->name);
+               strlcpy(info->devname, dev->name, sizeof(info->devname));
 
                /* kept for compatibility */
                info->bmversion[0] = 1;
                info->bmversion[1] = 0;
                info->bmversion[2] = 0;
-               sprintf(info->bmname, "%s", "gennvm");
+               strlcpy(info->bmname, "gennvm", sizeof(info->bmname));
                i++;
 
                if (i > 31) {