linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] block: bsg.c:  Cleaning up missing null-terminate in conjunction with strncpy
@ 2014-07-26 14:07 Rickard Strandqvist
  2014-07-28 14:31 ` Jeff Moyer
  0 siblings, 1 reply; 3+ messages in thread
From: Rickard Strandqvist @ 2014-07-26 14:07 UTC (permalink / raw)
  To: FUJITA Tomonori, Jens Axboe; +Cc: Rickard Strandqvist, linux-scsi, linux-kernel

Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 block/bsg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/bsg.c b/block/bsg.c
index ff46add..b2688c5 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -790,7 +790,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
 	mutex_lock(&bsg_mutex);
 	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
 
-	strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
+	strlcpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name));
 	dprintk("bound to <%s>, max queue %d\n",
 		format_dev_t(buf, inode->i_rdev), bd->max_queue);
 
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] block: bsg.c:  Cleaning up missing null-terminate in conjunction with strncpy
  2014-07-26 14:07 [PATCH] block: bsg.c: Cleaning up missing null-terminate in conjunction with strncpy Rickard Strandqvist
@ 2014-07-28 14:31 ` Jeff Moyer
  2014-07-29 19:09   ` Rickard Strandqvist
  0 siblings, 1 reply; 3+ messages in thread
From: Jeff Moyer @ 2014-07-28 14:31 UTC (permalink / raw)
  To: Rickard Strandqvist; +Cc: FUJITA Tomonori, Jens Axboe, linux-scsi, linux-kernel

Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:

> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
>  block/bsg.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/bsg.c b/block/bsg.c
> index ff46add..b2688c5 100644
> --- a/block/bsg.c
> +++ b/block/bsg.c
> @@ -790,7 +790,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
>  	mutex_lock(&bsg_mutex);
>  	hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
>  
> -	strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
> +	strlcpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name));
>  	dprintk("bound to <%s>, max queue %d\n",
>  		format_dev_t(buf, inode->i_rdev), bd->max_queue);

NACK

The bsg data structure is allocated using kzalloc, so that last byte
will be zero.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] block: bsg.c: Cleaning up missing null-terminate in conjunction with strncpy
  2014-07-28 14:31 ` Jeff Moyer
@ 2014-07-29 19:09   ` Rickard Strandqvist
  0 siblings, 0 replies; 3+ messages in thread
From: Rickard Strandqvist @ 2014-07-29 19:09 UTC (permalink / raw)
  To: Jeff Moyer
  Cc: FUJITA Tomonori, Jens Axboe, linux-scsi,
	linux-kernel@vger.kernel.org

2014-07-28 16:31 GMT+02:00 Jeff Moyer <jmoyer@redhat.com>:
> Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> writes:
>
>> Replacing strncpy with strlcpy to avoid strings that lacks null terminate.
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
>> ---
>>  block/bsg.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/block/bsg.c b/block/bsg.c
>> index ff46add..b2688c5 100644
>> --- a/block/bsg.c
>> +++ b/block/bsg.c
>> @@ -790,7 +790,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
>>       mutex_lock(&bsg_mutex);
>>       hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(iminor(inode)));
>>
>> -     strncpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name) - 1);
>> +     strlcpy(bd->name, dev_name(rq->bsg_dev.class_dev), sizeof(bd->name));
>>       dprintk("bound to <%s>, max queue %d\n",
>>               format_dev_t(buf, inode->i_rdev), bd->max_queue);
>
> NACK
>
> The bsg data structure is allocated using kzalloc, so that last byte
> will be zero.

Hi

Sorry.. I did not know bsg_alloc_device used kzalloc, right then
everything should be ok.

Kind regards
Rickard Strandqvist

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-07-29 19:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-26 14:07 [PATCH] block: bsg.c: Cleaning up missing null-terminate in conjunction with strncpy Rickard Strandqvist
2014-07-28 14:31 ` Jeff Moyer
2014-07-29 19:09   ` Rickard Strandqvist

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).