2013-04-07 11:03:42

by Chen Gang

Subject: [PATCH] kernel: debug: kdb: strncpy issue, using strlcpy instead of strncpy.

cmd_cur and cmd_hist[] are all NUL terminated string.
need using strlcpy instead of strncpy.

Signed-off-by: Chen Gang <[email protected]>
---
kernel/debug/kdb/kdb_main.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
index 00eb8f7..a2b04d7 100644
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
@@ -1063,12 +1063,12 @@ static int handle_ctrl_cmd(char *cmd)
case CTRL_P:
if (cmdptr != cmd_tail)
cmdptr = (cmdptr-1) % KDB_CMD_HISTORY_COUNT;
- strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
+ strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
return 1;
case CTRL_N:
if (cmdptr != cmd_head)
cmdptr = (cmdptr+1) % KDB_CMD_HISTORY_COUNT;
- strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
+ strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
return 1;
}
return 0;
@@ -1260,7 +1260,7 @@ do_full_getstr:
if (*cmdbuf != '\n') {
if (*cmdbuf < 32) {
if (cmdptr == cmd_head) {
- strncpy(cmd_hist[cmd_head], cmd_cur,
+ strlcpy(cmd_hist[cmd_head], cmd_cur,
CMD_BUFLEN);
*(cmd_hist[cmd_head] +
strlen(cmd_hist[cmd_head])-1) = '\0';
@@ -1270,7 +1270,7 @@ do_full_getstr:
cmdbuf = cmd_cur;
goto do_full_getstr;
} else {
- strncpy(cmd_hist[cmd_head], cmd_cur,
+ strlcpy(cmd_hist[cmd_head], cmd_cur,
CMD_BUFLEN);
}

--
1.7.7.6

2013-04-17 09:43:55

by Chen Gang

Subject: Re: [PATCH] kernel: debug: kdb: strncpy issue, using strlcpy instead of strncpy.

Hello maintainers:

please help check this patch, when you have time, thanks.


On 2013年04月07日 19:03, Chen Gang wrote:
>
> cmd_cur and cmd_hist[] are all NUL terminated string.
> need using strlcpy instead of strncpy.
>
> Signed-off-by: Chen Gang <[email protected]>
> ---
> kernel/debug/kdb/kdb_main.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
> index 00eb8f7..a2b04d7 100644
> --- a/kernel/debug/kdb/kdb_main.c
> +++ b/kernel/debug/kdb/kdb_main.c
> @@ -1063,12 +1063,12 @@ static int handle_ctrl_cmd(char *cmd)
> case CTRL_P:
> if (cmdptr != cmd_tail)
> cmdptr = (cmdptr-1) % KDB_CMD_HISTORY_COUNT;
> - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> return 1;
> case CTRL_N:
> if (cmdptr != cmd_head)
> cmdptr = (cmdptr+1) % KDB_CMD_HISTORY_COUNT;
> - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> return 1;
> }
> return 0;
> @@ -1260,7 +1260,7 @@ do_full_getstr:
> if (*cmdbuf != '\n') {
> if (*cmdbuf < 32) {
> if (cmdptr == cmd_head) {
> - strncpy(cmd_hist[cmd_head], cmd_cur,
> + strlcpy(cmd_hist[cmd_head], cmd_cur,
> CMD_BUFLEN);
> *(cmd_hist[cmd_head] +
> strlen(cmd_hist[cmd_head])-1) = '\0';
> @@ -1270,7 +1270,7 @@ do_full_getstr:
> cmdbuf = cmd_cur;
> goto do_full_getstr;
> } else {
> - strncpy(cmd_hist[cmd_head], cmd_cur,
> + strlcpy(cmd_hist[cmd_head], cmd_cur,
> CMD_BUFLEN);
> }
>
>


--
Chen Gang

Asianux Corporation

2013-04-23 21:43:28

by Anton Vorontsov

Subject: Re: [PATCH] kernel: debug: kdb: strncpy issue, using strlcpy instead of strncpy.

On Wed, Apr 17, 2013 at 05:43:13PM +0800, Chen Gang wrote:
> Hello maintainers:
>
> please help check this patch, when you have time, thanks.
>

The patch looks good. I would add to the description: "..., otherwise the
destination string might end up not being terminted with the NUL, causing
all sorts of misbehaviour."

Acked-by: Anton Vorontsov <[email protected]>

Thanks!

> On 2013年04月07日 19:03, Chen Gang wrote:
> >
> > cmd_cur and cmd_hist[] are all NUL terminated string.
> > need using strlcpy instead of strncpy.
> >
> > Signed-off-by: Chen Gang <[email protected]>
> > ---
> > kernel/debug/kdb/kdb_main.c | 8 ++++----
> > 1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
> > index 00eb8f7..a2b04d7 100644
> > --- a/kernel/debug/kdb/kdb_main.c
> > +++ b/kernel/debug/kdb/kdb_main.c
> > @@ -1063,12 +1063,12 @@ static int handle_ctrl_cmd(char *cmd)
> > case CTRL_P:
> > if (cmdptr != cmd_tail)
> > cmdptr = (cmdptr-1) % KDB_CMD_HISTORY_COUNT;
> > - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> > + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> > return 1;
> > case CTRL_N:
> > if (cmdptr != cmd_head)
> > cmdptr = (cmdptr+1) % KDB_CMD_HISTORY_COUNT;
> > - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> > + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
> > return 1;
> > }
> > return 0;
> > @@ -1260,7 +1260,7 @@ do_full_getstr:
> > if (*cmdbuf != '\n') {
> > if (*cmdbuf < 32) {
> > if (cmdptr == cmd_head) {
> > - strncpy(cmd_hist[cmd_head], cmd_cur,
> > + strlcpy(cmd_hist[cmd_head], cmd_cur,
> > CMD_BUFLEN);
> > *(cmd_hist[cmd_head] +
> > strlen(cmd_hist[cmd_head])-1) = '\0';
> > @@ -1270,7 +1270,7 @@ do_full_getstr:
> > cmdbuf = cmd_cur;
> > goto do_full_getstr;
> > } else {
> > - strncpy(cmd_hist[cmd_head], cmd_cur,
> > + strlcpy(cmd_hist[cmd_head], cmd_cur,
> > CMD_BUFLEN);
> > }
> >
> >
>
>
> --
> Chen Gang
>
> Asianux Corporation

2013-04-24 01:12:57

by Chen Gang

Subject: Re: [PATCH] kernel: debug: kdb: strncpy issue, using strlcpy instead of strncpy.

On 2013??04??24?? 04:50, Anton Vorontsov wrote:
> On Wed, Apr 17, 2013 at 05:43:13PM +0800, Chen Gang wrote:
>> > Hello maintainers:
>> >
>> > please help check this patch, when you have time, thanks.
>> >
> The patch looks good. I would add to the description: "..., otherwise the
> destination string might end up not being terminted with the NUL, causing
> all sorts of misbehaviour."
>
> Acked-by: Anton Vorontsov <[email protected]>
>
> Thanks!
>

Thanks, also thank you for your additional description.

--
Chen Gang

Asianux Corporation

2013-05-16 11:38:58

by Chen Gang

Subject: Re: [PATCH] kernel: debug: kdb: strncpy issue, using strlcpy instead of strncpy.

Hello Maintainers:

Please help check and apply this patch when you hanve time, thanks.

It is already Acked-by Anton, please see below.

Thanks.


On Wed, Apr 17, 2013 at 05:43:13PM +0800, Chen Gang wrote:
> Hello maintainers:
>
> please help check this patch, when you have time, thanks.
>

The patch looks good. I would add to the description: "..., otherwise the
destination string might end up not being terminted with the NUL, causing
all sorts of misbehaviour."

Acked-by: Anton Vorontsov <[email protected]>

Thanks!

> On 2013年04月07日 19:03, Chen Gang wrote:
>>
>> cmd_cur and cmd_hist[] are all NUL terminated string.
>> need using strlcpy instead of strncpy.
>>
>> Signed-off-by: Chen Gang <[email protected]>
>> ---
>> kernel/debug/kdb/kdb_main.c | 8 ++++----
>> 1 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
>> index 00eb8f7..a2b04d7 100644
>> --- a/kernel/debug/kdb/kdb_main.c
>> +++ b/kernel/debug/kdb/kdb_main.c
>> @@ -1063,12 +1063,12 @@ static int handle_ctrl_cmd(char *cmd)
>> case CTRL_P:
>> if (cmdptr != cmd_tail)
>> cmdptr = (cmdptr-1) % KDB_CMD_HISTORY_COUNT;
>> - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
>> + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
>> return 1;
>> case CTRL_N:
>> if (cmdptr != cmd_head)
>> cmdptr = (cmdptr+1) % KDB_CMD_HISTORY_COUNT;
>> - strncpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
>> + strlcpy(cmd_cur, cmd_hist[cmdptr], CMD_BUFLEN);
>> return 1;
>> }
>> return 0;
>> @@ -1260,7 +1260,7 @@ do_full_getstr:
>> if (*cmdbuf != '\n') {
>> if (*cmdbuf < 32) {
>> if (cmdptr == cmd_head) {
>> - strncpy(cmd_hist[cmd_head], cmd_cur,
>> + strlcpy(cmd_hist[cmd_head], cmd_cur,
>> CMD_BUFLEN);
>> *(cmd_hist[cmd_head] +
>> strlen(cmd_hist[cmd_head])-1) = '\0';
>> @@ -1270,7 +1270,7 @@ do_full_getstr:
>> cmdbuf = cmd_cur;
>> goto do_full_getstr;
>> } else {
>> - strncpy(cmd_hist[cmd_head], cmd_cur,
>> + strlcpy(cmd_hist[cmd_head], cmd_cur,
>> CMD_BUFLEN);
>> }
>>
>>
>
>
> --
> Chen Gang
>
> Asianux Corporation