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

Groups > linux.kernel > #1620627 > unrolled thread

[PATCH 1/3] lightnvm: convert sprintf into snprintf

Back to article view | Back to linux.kernel

Contents

  [PATCH 1/3] lightnvm: convert sprintf into snprintf "Javier González" <jg@lightnvm.io> - 2017-04-10 21:00 +0200
    [PATCH 2/3] lightnvm: make nvm_free static "Javier González" <jg@lightnvm.io> - 2017-04-10 21:00 +0200
      Re: [PATCH 2/3] lightnvm: make nvm_free static Matias Bjørling <mb@lightnvm.io> - 2017-04-11 13:00 +0200

#1620627 — [PATCH 1/3] lightnvm: convert sprintf into snprintf

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

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

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index c3340ef..bdbb333 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -272,7 +272,8 @@ 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);
+	snprintf(tdisk->disk_name, sizeof(tdisk->disk_name), "%s",
+							create->tgtname);
 	tdisk->flags = GENHD_FL_EXT_DEVT;
 	tdisk->major = 0;
 	tdisk->first_minor = 0;
@@ -1195,13 +1196,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);
+		snprintf(info->devname, sizeof(info->devname), "%s", dev->name);
 
 		/* kept for compatibility */
 		info->bmversion[0] = 1;
 		info->bmversion[1] = 0;
 		info->bmversion[2] = 0;
-		sprintf(info->bmname, "%s", "gennvm");
+		snprintf(info->bmname, sizeof(info->bmname), "%s", "gennvm");
 		i++;
 
 		if (i > 31) {
-- 
2.7.4

[toc] | [next] | [standalone]

#1620630 — [PATCH 2/3] lightnvm: make nvm_free static

Prefix the nvm_free static function with a missing static keyword.

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

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index bdbb333..3e51a05 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -999,7 +999,7 @@ static int nvm_core_init(struct nvm_dev *dev)
 	return ret;
 }
 
-void nvm_free(struct nvm_dev *dev)
+static void nvm_free(struct nvm_dev *dev)
 {
 	if (!dev)
 		return;
-- 
2.7.4

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

#1621150 — Re: [PATCH 2/3] lightnvm: make nvm_free static

On 04/10/2017 08:51 PM, Javier González wrote:
> Prefix the nvm_free static function with a missing static keyword.
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index bdbb333..3e51a05 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -999,7 +999,7 @@ static int nvm_core_init(struct nvm_dev *dev)
>  	return ret;
>  }
>
> -void nvm_free(struct nvm_dev *dev)
> +static void nvm_free(struct nvm_dev *dev)
>  {
>  	if (!dev)
>  		return;
>

Thanks. Applied for 4.12.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web