* [dpdk-dev] [PATCH] lib: fix strcat with equivalent logic
@ 2019-02-14 9:35 Chaitanya Babu Talluri
0 siblings, 0 replies; 3+ messages in thread
From: Chaitanya Babu Talluri @ 2019-02-14 9:35 UTC (permalink / raw)
To: dev
Cc: reshma.pattan, cristian.dumitrescu, jananeex.m.parthasarathy,
Chaitanya Babu Talluri, stable
Replace strcat with concatenation logic to avoid buffer overflow.
Fixes: a6a47ac9c2 ("cfgfile: rework load function")
Cc: stable@dpdk.org
Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
---
lib/librte_cfgfile/rte_cfgfile.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 7d8c941ea..7616742f7 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -227,7 +227,15 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
while (end != NULL) {
if (*(end+1) == params->comment_character) {
*end = '\0';
- strcat(split[1], end+1);
+ int index = strlen(split[1]);
+ char *temp = end+1;
+ while (*temp != '\0') {
+ split[1][index] = *temp;
+ index++;
+ temp++;
+ }
+ split[1][index] = '\0';
+
} else
end++;
end = memchr(end, '\\', strlen(end));
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] lib: fix strcat with equivalent logic
2019-02-14 9:30 Chaitanya Babu Talluri
@ 2019-02-14 14:00 ` Bruce Richardson
0 siblings, 0 replies; 3+ messages in thread
From: Bruce Richardson @ 2019-02-14 14:00 UTC (permalink / raw)
To: Chaitanya Babu Talluri
Cc: dev, reshma.pattan, cristian.dumitrescu,
jananeex.m.parthasarathy, stable
On Thu, Feb 14, 2019 at 09:30:31AM +0000, Chaitanya Babu Talluri wrote:
> Replace strcat with concatenation logic to avoid buffer overflow.
>
> Fixes: a6a47ac9c2 ("cfgfile: rework load function")
> Cc: stable@dpdk.org
>
> Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
> ---
> lib/librte_cfgfile/rte_cfgfile.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
> index 7d8c941ea..7616742f7 100644
> --- a/lib/librte_cfgfile/rte_cfgfile.c
> +++ b/lib/librte_cfgfile/rte_cfgfile.c
> @@ -227,7 +227,15 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
> while (end != NULL) {
> if (*(end+1) == params->comment_character) {
> *end = '\0';
> - strcat(split[1], end+1);
> + int index = strlen(split[1]);
> + char *temp = end+1;
> + while (*temp != '\0') {
> + split[1][index] = *temp;
> + index++;
> + temp++;
> + }
> + split[1][index] = '\0';
> +
I don't see how this change fixes the problem. From what I see, you have
just inlined the strcat function into the code above, without changing any
of the logic. To prevent buffer overflows using strcat, you need to
identify the total buffer length and use that when copying. I suggest
reworking this code to use strlcat.
/Bruce
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-dev] [PATCH] lib: fix strcat with equivalent logic
@ 2019-02-14 9:30 Chaitanya Babu Talluri
2019-02-14 14:00 ` Bruce Richardson
0 siblings, 1 reply; 3+ messages in thread
From: Chaitanya Babu Talluri @ 2019-02-14 9:30 UTC (permalink / raw)
To: dev
Cc: reshma.pattan, cristian.dumitrescu, jananeex.m.parthasarathy,
Chaitanya Babu Talluri, stable
Replace strcat with concatenation logic to avoid buffer overflow.
Fixes: a6a47ac9c2 ("cfgfile: rework load function")
Cc: stable@dpdk.org
Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
---
lib/librte_cfgfile/rte_cfgfile.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 7d8c941ea..7616742f7 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -227,7 +227,15 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
while (end != NULL) {
if (*(end+1) == params->comment_character) {
*end = '\0';
- strcat(split[1], end+1);
+ int index = strlen(split[1]);
+ char *temp = end+1;
+ while (*temp != '\0') {
+ split[1][index] = *temp;
+ index++;
+ temp++;
+ }
+ split[1][index] = '\0';
+
} else
end++;
end = memchr(end, '\\', strlen(end));
--
2.17.2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-14 14:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14 9:35 [dpdk-dev] [PATCH] lib: fix strcat with equivalent logic Chaitanya Babu Talluri
-- strict thread matches above, loose matches on Subject: below --
2019-02-14 9:30 Chaitanya Babu Talluri
2019-02-14 14:00 ` Bruce Richardson
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).