All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] lightnvm: convert sprintf into snprintf
@ 2017-04-10 18:51 Javier González
  2017-04-10 18:51 ` [PATCH 2/3] lightnvm: make nvm_free static Javier González
  2017-04-10 18:56   ` Bart Van Assche
  0 siblings, 2 replies; 6+ messages in thread
From: Javier González @ 2017-04-10 18:51 UTC (permalink / raw)
  To: mb; +Cc: linux-block, linux-kernel, Javier González

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/3] lightnvm: make nvm_free static
  2017-04-10 18:51 [PATCH 1/3] lightnvm: convert sprintf into snprintf Javier González
@ 2017-04-10 18:51 ` Javier González
  2017-04-11 10:51   ` Matias Bjørling
  2017-04-10 18:56   ` Bart Van Assche
  1 sibling, 1 reply; 6+ messages in thread
From: Javier González @ 2017-04-10 18:51 UTC (permalink / raw)
  To: mb; +Cc: linux-block, linux-kernel, Javier González

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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] lightnvm: convert sprintf into snprintf
  2017-04-10 18:51 [PATCH 1/3] lightnvm: convert sprintf into snprintf Javier González
@ 2017-04-10 18:56   ` Bart Van Assche
  2017-04-10 18:56   ` Bart Van Assche
  1 sibling, 0 replies; 6+ messages in thread
From: Bart Van Assche @ 2017-04-10 18:56 UTC (permalink / raw)
  To: mb, jg; +Cc: linux-kernel, linux-block, javier

On Mon, 2017-04-10 at 20:51 +0200, Javier Gonz=E1lez wrote:
> Convert sprintf calls to snprintf in order to make possible buffer
> overflow more obvious.
>=20
> Signed-off-by: Javier Gonz=E1lez <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/core.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>=20
> 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);
> =20
> -	sprintf(tdisk->disk_name, "%s", create->tgtname);
> +	snprintf(tdisk->disk_name, sizeof(tdisk->disk_name), "%s",
> +							create->tgtname);
>  	tdisk->flags =3D GENHD_FL_EXT_DEVT;
>  	tdisk->major =3D 0;
>  	tdisk->first_minor =3D 0;
> @@ -1195,13 +1196,13 @@ static long nvm_ioctl_get_devices(struct file *fi=
le, void __user *arg)
>  	list_for_each_entry(dev, &nvm_devices, devices) {
>  		struct nvm_ioctl_device_info *info =3D &devices->info[i];
> =20
> -		sprintf(info->devname, "%s", dev->name);
> +		snprintf(info->devname, sizeof(info->devname), "%s", dev->name);
> =20
>  		/* kept for compatibility */
>  		info->bmversion[0] =3D 1;
>  		info->bmversion[1] =3D 0;
>  		info->bmversion[2] =3D 0;
> -		sprintf(info->bmname, "%s", "gennvm");
> +		snprintf(info->bmname, sizeof(info->bmname), "%s", "gennvm");
>  		i++;
> =20
>  		if (i > 31) {

Hello Javier,

Although the above changes look fine to me, have you considered to use strl=
cpy()
instead of snprintf() for these string copy operations?

Bart.=

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] lightnvm: convert sprintf into snprintf
@ 2017-04-10 18:56   ` Bart Van Assche
  0 siblings, 0 replies; 6+ messages in thread
From: Bart Van Assche @ 2017-04-10 18:56 UTC (permalink / raw)
  To: mb, jg; +Cc: linux-kernel, linux-block, javier

On Mon, 2017-04-10 at 20:51 +0200, Javier González wrote:
> 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) {

Hello Javier,

Although the above changes look fine to me, have you considered to use strlcpy()
instead of snprintf() for these string copy operations?

Bart.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] lightnvm: convert sprintf into snprintf
  2017-04-10 18:56   ` Bart Van Assche
  (?)
@ 2017-04-11  6:31   ` Javier González
  -1 siblings, 0 replies; 6+ messages in thread
From: Javier González @ 2017-04-11  6:31 UTC (permalink / raw)
  To: Bart Van Assche; +Cc: Matias Bjørling, linux-kernel, linux-block

[-- Attachment #1: Type: text/plain, Size: 1879 bytes --]

> On 10 Apr 2017, at 20.56, Bart Van Assche <Bart.VanAssche@sandisk.com> wrote:
> 
> On Mon, 2017-04-10 at 20:51 +0200, Javier González wrote:
>> 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) {
> 
> Hello Javier,
> 
> Although the above changes look fine to me, have you considered to use strlcpy()
> instead of snprintf() for these string copy operations?

You're right. It is a better way of doing it.

Thanks!

> 
> Bart.

Javier

[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] lightnvm: make nvm_free static
  2017-04-10 18:51 ` [PATCH 2/3] lightnvm: make nvm_free static Javier González
@ 2017-04-11 10:51   ` Matias Bjørling
  0 siblings, 0 replies; 6+ messages in thread
From: Matias Bjørling @ 2017-04-11 10:51 UTC (permalink / raw)
  To: Javier González; +Cc: linux-block, linux-kernel, Javier González

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.

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-11 10:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 18:51 [PATCH 1/3] lightnvm: convert sprintf into snprintf Javier González
2017-04-10 18:51 ` [PATCH 2/3] lightnvm: make nvm_free static Javier González
2017-04-11 10:51   ` Matias Bjørling
2017-04-10 18:56 ` [PATCH 1/3] lightnvm: convert sprintf into snprintf Bart Van Assche
2017-04-10 18:56   ` Bart Van Assche
2017-04-11  6:31   ` Javier González

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.