---
plugins/irmc.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/irmc.c b/plugins/irmc.c
index 6f28e51..8344a47 100644
--- a/plugins/irmc.c
+++ b/plugins/irmc.c
@@ -215,9 +215,9 @@ static void *irmc_connect(struct obex_session *os, int *err)
* For now lets used hostname and some 'random' value
*/
gethostname(irmc->did, DID_LEN);
- strncpy(irmc->sn, "12345", DID_LEN);
- strncpy(irmc->manu, "obex", DID_LEN);
- strncpy(irmc->model, "mymodel", DID_LEN);
+ strncpy(irmc->sn, "12345", sizeof(irmc->sn) - 1);
+ strncpy(irmc->manu, "obex", sizeof(irmc->manu) - 1);
+ strncpy(irmc->model, "mymodel", sizeof(irmc->model) - 1);
/* We need to know the number of contact/cal/nt entries
* somewhere so why not do it now.
--
1.7.1
Hi Luiz,
--------------------------------------------------
From: "Luiz Augusto von Dentz" <[email protected]>
Sent: Thursday, February 09, 2012 4:37 PM
To: "Jaganath" <[email protected]>
Cc: <[email protected]>
Subject: Re: [PATCH obexd 3/4] irmc: Fix length parameter of strncpy
> Hi Jaganath,
>
> On Fri, Feb 3, 2012 at 2:22 PM, Jaganath <[email protected]> wrote:
>> I checked IRMC spec and could not find any length restriction.
>> For "sn" spec says "The format of the field is manufacturer dependent."
>> and for "manu" and "model" the acceptable value is string.
>
> The patch is not exactly wrong, but I fear that if we really start
> reading this information from somewhere, which I guess it is whole
> point here, then this fixed length may need some change.
Correct. This patch is just a fix to a static tool reported issue
Regards
Jaganath
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth"
> in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Jaganath,
On Fri, Feb 3, 2012 at 2:22 PM, Jaganath <[email protected]> wrote:
> I checked IRMC spec and could not find any length restriction.
> For "sn" spec says "The format of the field is manufacturer dependent."
> and for "manu" and "model" the acceptable value is string.
The patch is not exactly wrong, but I fear that if we really start
reading this information from somewhere, which I guess it is whole
point here, then this fixed length may need some change.
--
Luiz Augusto von Dentz
Hi Jaganath,
On Thu, Feb 02, 2012, Jaganath Kanakkassery wrote:
> ---
> plugins/irmc.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
This patch has now also been applied.
Johan
Hi Luiz,
--------------------------------------------------
From: "Luiz Augusto von Dentz" <[email protected]>
Sent: Thursday, February 02, 2012 10:59 PM
To: "Jaganath Kanakkassery" <[email protected]>
Cc: <[email protected]>
Subject: Re: [PATCH obexd 3/4] irmc: Fix length parameter of strncpy
> Hi Jaganath,
>
> On Thu, Feb 2, 2012 at 3:34 AM, Jaganath Kanakkassery
> <[email protected]> wrote:
>> ---
>> plugins/irmc.c | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/plugins/irmc.c b/plugins/irmc.c
>> index 6f28e51..8344a47 100644
>> --- a/plugins/irmc.c
>> +++ b/plugins/irmc.c
>> @@ -215,9 +215,9 @@ static void *irmc_connect(struct obex_session *os,
>> int *err)
>> * For now lets used hostname and some 'random' value
>> */
>> gethostname(irmc->did, DID_LEN);
>> - strncpy(irmc->sn, "12345", DID_LEN);
>> - strncpy(irmc->manu, "obex", DID_LEN);
>> - strncpy(irmc->model, "mymodel", DID_LEN);
>> + strncpy(irmc->sn, "12345", sizeof(irmc->sn) - 1);
>> + strncpy(irmc->manu, "obex", sizeof(irmc->manu) - 1);
>> + strncpy(irmc->model, "mymodel", sizeof(irmc->model) - 1);
>
> Not sure what is the point to use a fixed size array here? Does the
> spec require it to be 18 bytes long?
I checked IRMC spec and could not find any length restriction.
For "sn" spec says "The format of the field is manufacturer dependent."
and for "manu" and "model" the acceptable value is string.
>
> --
> Luiz Augusto von Dentz
Regards
Jaganath
Hi Jaganath,
On Thu, Feb 2, 2012 at 3:34 AM, Jaganath Kanakkassery
<[email protected]> wrote:
> ---
> ?plugins/irmc.c | ? ?6 +++---
> ?1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/plugins/irmc.c b/plugins/irmc.c
> index 6f28e51..8344a47 100644
> --- a/plugins/irmc.c
> +++ b/plugins/irmc.c
> @@ -215,9 +215,9 @@ static void *irmc_connect(struct obex_session *os, int *err)
> ? ? ? ? * For now lets used hostname and some 'random' value
> ? ? ? ? */
> ? ? ? ?gethostname(irmc->did, DID_LEN);
> - ? ? ? strncpy(irmc->sn, "12345", DID_LEN);
> - ? ? ? strncpy(irmc->manu, "obex", DID_LEN);
> - ? ? ? strncpy(irmc->model, "mymodel", DID_LEN);
> + ? ? ? strncpy(irmc->sn, "12345", sizeof(irmc->sn) - 1);
> + ? ? ? strncpy(irmc->manu, "obex", sizeof(irmc->manu) - 1);
> + ? ? ? strncpy(irmc->model, "mymodel", sizeof(irmc->model) - 1);
Not sure what is the point to use a fixed size array here? Does the
spec require it to be 18 bytes long?
--
Luiz Augusto von Dentz