Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1621342 > unrolled thread

[PATCH 0/3] lightnvm: small fixes

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/3] lightnvm: small fixes "Javier González" <jg@lightnvm.io> - 2017-04-11 16:30 +0200
    [PATCH 3/3] lightnvm: convert sprintf into strlcpy "Javier González" <jg@lightnvm.io> - 2017-04-11 16:30 +0200
      Re: [PATCH 3/3] lightnvm: convert sprintf into strlcpy Matias Bjørling <mb@lightnvm.io> - 2017-04-11 16:40 +0200

#1621342 — [PATCH 0/3] lightnvm: small fixes

Last small lightnvm fixes for lightnvm core. These are  motivated by
Bart's comments on pblk's patch.

Javier González (3):
  lightnvm: clean unused variable
  lightnvm: fix type checks on rrpc
  lightnvm: convert sprintf into strlcpy

 drivers/lightnvm/core.c | 9 +++------
 drivers/lightnvm/rrpc.c | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

-- 
2.7.4

[toc] | [next] | [standalone]

#1621354 — [PATCH 3/3] lightnvm: convert sprintf into strlcpy

Convert sprintf calls to strlcpy in order to make possible buffer
overflow more obvious.

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/lightnvm/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 258007a..2c26af3 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -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) {
-- 
2.7.4

[toc] | [prev] | [next] | [standalone]

#1621365 — Re: [PATCH 3/3] lightnvm: convert sprintf into strlcpy

On 04/11/2017 04:18 PM, Javier González wrote:
> Convert sprintf calls to strlcpy in order to make possible buffer
> overflow more obvious.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/core.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index 258007a..2c26af3 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -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) {
>
Thanks. Applied for 4.12.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web