*** minor fixes in DHCP6 ***
cover *** minor fixes in DHCP6 ***
From: Sean Edmond <[email protected]>
Resolves 2 issues:
- coverity CID 453851 and 436278
- Change DHCP6 VCI string from "U-boot" to "U-Boot" (this was found by more detailed testing on our end)
Sean Edmond (2):
net: ipv6: Fix CID 453851 and CID 436278
net: dhcp6: Fix VCI string
cmd/net.c | 12 ++++++------ net/dhcpv6.c | 5 +++++ net/dhcpv6.h | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-)
Signature · 1 line
2.40.0
PATCH 1/2 net: ipv6: Fix CID 453851 and CID 436278
From: Sean Edmond <[email protected]>
CID 453851 : sprintf() shouldn't copy from/to tmp CID 436278 : DHCP6 option_len should be checked before use
--- cmd/net.c | 12 ++++++------ net/dhcpv6.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-)
cmd/net.c +6 -6
@@ -209,7 +209,7 @@ U_BOOT_CMD(static void netboot_update_env (void ) { -char tmp[44 ]; +char tmp[46 ];if (net_gateway.s_addr) {ip_to_string (net_gateway, tmp);
@@ -274,20 +274,20 @@ static void netboot_update_env(void)if (IS_ENABLED (CONFIG_IPV6 )) {if (!ip6_is_unspecified_addr (&net_ip6) || net_prefix_length !=0 ) { -sprintf (tmp,"%pI6c" , &net_ip6);if (net_prefix_length !=0 ) -sprintf (tmp,"%s/%d" , tmp, net_prefix_length); - +snprintf (tmp,sizeof (tmp),"%pI6c/%d" , &net_ip6, net_prefix_length); +else +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_ip6);env_set ("ip6addr" , tmp); }if (!ip6_is_unspecified_addr (&net_server_ip6)) { -sprintf (tmp,"%pI6c" , &net_server_ip6); +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_server_ip6);env_set ("serverip6" , tmp); }if (!ip6_is_unspecified_addr (&net_gateway6)) { -sprintf (tmp,"%pI6c" , &net_gateway6); +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_gateway6);env_set ("gatewayip6" , tmp); } }
net/dhcpv6.c +5 -0
@@ -316,6 +316,11 @@ static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len) option_ptr = ((uchar *)option_hdr) +sizeof (struct dhcp6_hdr ); option_len =ntohs (option_hdr->option_len); +if (option_ptr + option_len > rx_pkt + len) { +debug ("Invalid option length\n" ); +return ; + } +switch (ntohs (option_hdr->option_id)) {case DHCP6_OPTION_CLIENTID : if (memcmp(option_ptr, sm_params.duid, option_len)
Signature · 1 line
2.40.0
PATCH 2/2 net: dhcp6: Fix VCI string
In reply to [email protected]From: Sean Edmond <[email protected]>
Change VCI string from "U-boot" to "U-Boot".
--- net/dhcpv6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/dhcpv6.h +1 -1
@@ -38,7 +38,7 @@#define DUID_MAX_SIZE DUID_LL_SIZE/* only supports DUID-LL currently */ /* vendor-class-data to send in vendor clas option */ -#define DHCP6_VCI_STRING "U-boot" +#define DHCP6_VCI_STRING "U-Boot"#define DHCP6_MULTICAST_ADDR "ff02::1:2"/* DHCP multicast address */
Signature · 1 line
2.40.0
Re: [PATCH 1/2] net: ipv6: Fix CID 453851 and CID 436278
In reply to [email protected]Quoted 68 lines · On Thu, May 18, 2023 at 10:35 PM <[email protected]> wrote:
From: Sean Edmond <[email protected]>
CID 453851 :
sprintf()shouldn't copy from/to tmp CID 436278 : DHCP6option_lenshould be checked before useSigned-off-by Sean Edmond <[email protected]>--- cmd/net.c | 12 ++++++------ net/dhcpv6.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-)cmd/net.c +6
-6@@ -209,7 +209,7 @@ U_BOOT_CMD(static void netboot_update_env (void ) { -char tmp[44 ]; +char tmp[46 ];if (net_gateway.s_addr) {ip_to_string (net_gateway, tmp);@@ -274,20 +274,20 @@ static void netboot_update_env(void)if (IS_ENABLED (CONFIG_IPV6 )) {if (!ip6_is_unspecified_addr (&net_ip6) || net_prefix_length !=0 ) { -sprintf (tmp,"%pI6c" , &net_ip6);if (net_prefix_length !=0 ) -sprintf (tmp,"%s/%d" , tmp, net_prefix_length); - +snprintf (tmp,sizeof (tmp),"%pI6c/%d" , &net_ip6, net_prefix_length); +else +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_ip6);env_set ("ip6addr" , tmp); }if (!ip6_is_unspecified_addr (&net_server_ip6)) { -sprintf (tmp,"%pI6c" , &net_server_ip6); +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_server_ip6);env_set ("serverip6" , tmp); }if (!ip6_is_unspecified_addr (&net_gateway6)) { -sprintf (tmp,"%pI6c" , &net_gateway6); +snprintf (tmp,sizeof (tmp),"%pI6c" , &net_gateway6);env_set ("gatewayip6" , tmp); } }net/dhcpv6.c +5
-1@@ -316,6 +316,11 @@ static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len) option_ptr = ((uchar *)option_hdr) +sizeof (struct dhcp6_hdr ); option_len =ntohs (option_hdr->option_len); +if (option_ptr + option_len > rx_pkt + len) { +debug ("Invalid option length\n" ); +return ; + } +switch (ntohs (option_hdr->option_id)) {case DHCP6_OPTION_CLIENTID : if (memcmp(option_ptr, sm_params.duid, option_len) --
Quoted 2 lines
2.40.0
Re: [PATCH 2/2] net: dhcp6: Fix VCI string
In reply to [email protected]Quoted 24 lines · On Thu, May 18, 2023 at 10:35 PM <[email protected]> wrote:
From: Sean Edmond <[email protected]>
Change VCI string from "U-boot" to "U-Boot".
Signed-off-by Sean Edmond <[email protected]>--- net/dhcpv6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/dhcpv6.h +1
-2@@ -38,7 +38,7 @@#define DUID_MAX_SIZE DUID_LL_SIZE/* only supports DUID-LL currently */ /* vendor-class-data to send in vendor clas option */ -#define DHCP6_VCI_STRING "U-boot" +#define DHCP6_VCI_STRING "U-Boot"#define DHCP6_MULTICAST_ADDR "ff02::1:2"/* DHCP multicast address */ --
Quoted 2 lines
2.40.0
Re: [PATCH 1/2] net: ipv6: Fix CID 453851 and CID 436278
In reply to [email protected]Quoted 7 lines · On Thu, May 18, 2023 at 12:35:40PM -0700, [email protected] wrote:
From: Sean Edmond <[email protected]>
CID 453851 :
sprintf()shouldn't copy from/to tmp CID 436278 : DHCP6option_lenshould be checked before useSigned-off-by Sean Edmond <[email protected]>Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 2/2] net: dhcp6: Fix VCI string
In reply to [email protected]Quoted 6 lines · On Thu, May 18, 2023 at 12:35:41PM -0700, [email protected] wrote:
From: Sean Edmond <[email protected]>
Change VCI string from "U-boot" to "U-Boot".
Signed-off-by Sean Edmond <[email protected]>Reviewed-by Ramon Fried <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom