examples/vm_power: fix strcpy buffer overrun
PATCH 1/1 examples/vm_power: fix strcpy buffer overrun
replace strcpy with rte_strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]
--- examples/vm_power_manager/guest_cli/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
examples/vm_power_manager/guest_cli/main.c +1 -1
@@ -65,7 +65,7 @@ parse_args(int argc, char **argv)switch (opt) {/* portmask */ case 'n' : -strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );printf ("Setting VM Name to [%s]\n" , policy->vm_name);break ;case 'b' :
Signature · 1 line
2.17.1
Quoted 9 lines · David Hunt
replace strcpy with
rte_strlcpyto prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Fixes 59287933a0bb ("examples/vm_power: add options to guest app")Signed-off-by David Hunt <[email protected]>---
Signature · 2 lines
Thanks, Anatoly
Quoted 18 lines · David Hunt
replace strcpy with
rte_strlcpyto prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Fixes 59287933a0bb ("examples/vm_power: add options to guest app")Signed-off-by David Hunt <[email protected]>--- examples/vm_power_manager/guest_cli/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)examples/vm_power_manager/guest_cli/main.c +0
-0
examples/vm_power_manager/guest_cli/main.c parse_args(int argc, char **argv) · line 71
Quoted 8 lines
examples/vm_power_manager/guest_cli/main.c +1
-1@@ -65,7 +65,7 @@ parse_args(int argc, char **argv)switch (opt) {/* portmask */ case 'n' : -strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );printf ("Setting VM Name to [%s]\n" , policy->vm_name);break ;case 'b' :
You can just use "strlcpy" without the "rte_" prefix. The rte_ version is just a fallback used when a standard strlcpy - either natively or from libbsd - is unavailable.
12/07/2019 16:47, Bruce Richardson:
Quoted 9 lines · David Hunt
Quoted 8 lines
replace strcpy with
rte_strlcpyto prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Fixes 59287933a0bb ("examples/vm_power: add options to guest app")Signed-off-by David Hunt <[email protected]>
It should be in this order:
When in doubt about formatting, please check the git history. You will find that the recent title prefix in use was "examples/power".
Quoted 8 lines
examples/vm_power_manager/guest_cli/main.c parse_args(int argc, char **argv) · line 68
Quoted 4 lines
examples/vm_power_manager/guest_cli/main.c +1
-1-strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );You can just use "strlcpy" without the "
rte_" prefix. Therte_version is just a fallback used when a standard strlcpy - either natively or from libbsd - is unavailable.
Please replace the 2 other occurences of rte_strlcpy in this example (can be in the same patch with a small comment in the commit log).
PATCH v2 1/1 examples/vm_power: fix strcpy buffer overrun
In reply to David Huntreplace strcpy with strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]
Using strlcpy rather than rte_strlcpy, as the rte_ version is only a fallback.
As well as the fix in main.c, this patch also changes an occurrence of rte_strlcpy in channel_manager.c and channel_monitor.c to strlcpy.
--- examples/vm_power_manager/channel_manager.c | 2 +- examples/vm_power_manager/channel_monitor.c | 2 +- examples/vm_power_manager/guest_cli/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
examples/vm_power_manager/channel_manager.c +1 -1
@@ -588,7 +588,7 @@ add_host_channels(void) goto error; } chan_infos[i] = chan_info; -rte_strlcpy (chan_info->channel_path, socket_path, +strlcpy (chan_info->channel_path, socket_path,sizeof (chan_info->channel_path));if (setup_host_channel_info (&chan_info, i) <0 ) {
examples/vm_power_manager/channel_monitor.c +1 -1
@@ -309,7 +309,7 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt, vm_name);return -1 ; } -rte_strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); +strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); pkt->resource_id = resource_id; }return 0 ;
examples/vm_power_manager/guest_cli/main.c +1 -1
@@ -65,7 +65,7 @@ parse_args(int argc, char **argv)switch (opt) {/* portmask */ case 'n' : -strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );printf ("Setting VM Name to [%s]\n" , policy->vm_name);break ;case 'b' :
Signature · 1 line
2.17.1
16/07/2019 10:24, David Hunt:
Quoted 10 lines
replace strcpy with strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Using strlcpy rather than
rte_strlcpy, as therte_version is only a fallback.As well as the fix in
main.c, this patch also changes an occurrence ofrte_strlcpyinchannel_manager.candchannel_monitor.cto strlcpy.
[...]
examples/vm_power_manager/guest_cli/main.c parse_args(int argc, char **argv) · line 68
Quoted 4 lines
examples/vm_power_manager/guest_cli/main.c +1
-1-strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );
This is still using rte_strlcpy !!
Quoted 9 lines · Thomas Monjalon
16/07/2019 10:24, David Hunt:
Quoted 8 lines
replace strcpy with strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Using strlcpy rather than
rte_strlcpy, as therte_version is only a fallback.
Quoted 8 lines
Quoted 2 lines
As well as the fix in
main.c, this patch also changes an occurrence ofrte_strlcpyinchannel_manager.candchannel_monitor.cto strlcpy.[...]
examples/vm_power_manager/guest_cli/main.c parse_args(int argc, char **argv) · line 68
Quoted 4 lines
examples/vm_power_manager/guest_cli/main.c +1
-1-strcpy (policy->vm_name, optarg); +rte_strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );This is still using
rte_strlcpy!!
Apologies, too many balls in the air. v3 pushed.
PATCH v3 1/1 examples/vm_power: fix strcpy buffer overrun
In reply to David Huntreplace strcpy with strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]
Using strlcpy rather than rte_strlcpy, as the rte_ version is only a fallback.
As well as the fix in main.c, this patch also changes an occurrence of rte_strlcpy in channel_manager.c and channel_monitor.c to strlcpy.
--- examples/vm_power_manager/channel_manager.c | 2 +- examples/vm_power_manager/channel_monitor.c | 2 +- examples/vm_power_manager/guest_cli/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
examples/vm_power_manager/channel_manager.c +1 -1
@@ -588,7 +588,7 @@ add_host_channels(void) goto error; } chan_infos[i] = chan_info; -rte_strlcpy (chan_info->channel_path, socket_path, +strlcpy (chan_info->channel_path, socket_path,sizeof (chan_info->channel_path));if (setup_host_channel_info (&chan_info, i) <0 ) {
examples/vm_power_manager/channel_monitor.c +1 -1
@@ -309,7 +309,7 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt, vm_name);return -1 ; } -rte_strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); +strlcpy (pkt->vm_name, vm_name,VM_MAX_NAME_SZ ); pkt->resource_id = resource_id; }return 0 ;
examples/vm_power_manager/guest_cli/main.c +1 -1
@@ -65,7 +65,7 @@ parse_args(int argc, char **argv)switch (opt) {/* portmask */ case 'n' : -strcpy (policy->vm_name, optarg); +strlcpy (policy->vm_name, optarg,VM_MAX_NAME_SZ );printf ("Setting VM Name to [%s]\n" , policy->vm_name);break ;case 'b' :
Signature · 1 line
2.17.1
Thomas Monjalon
Applied16/07/2019 13:19, David Hunt:
Quoted 8 lines
replace strcpy with strlcpy to prevent buffer overrun With fix, attempting to use a VERY lonng vm name results in a nicely truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]Using strlcpy rather than
rte_strlcpy, as therte_version is only a fallback.
Quoted 7 lines
As well as the fix in
main.c, this patch also changes an occurrence ofrte_strlcpyinchannel_manager.candchannel_monitor.cto strlcpy.Fixes 59287933a0bb ("examples/vm_power: add options to guest app")Signed-off-by David Hunt <[email protected]>Acked-by Anatoly Burakov <[email protected]>
Applied, thanks