On Wed, 10 Jul 2019 14:33:42 -0400
Aaron Conole <acon...@redhat.com> wrote:
> rte_ether_unformation_addr is very lax in what it accepts now, including
> ethernet addresses formatted ambiguously as "x:xx:x:xx:x:xx". However,
> previously this behavior was enforced via the my_ether_aton which would
> fail ambiguously formatted values.
>
> Reported-by: Michael Santana <msant...@redhat.com>
> Fixes: 596d31092d32 ("net: add function to convert string to ethernet
> address")
> Signed-off-by: Aaron Conole <acon...@redhat.com>
> ---
> lib/librte_net/rte_ether.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c
> index 8d040173c..4f252b813 100644
> --- a/lib/librte_net/rte_ether.c
> +++ b/lib/librte_net/rte_ether.c
> @@ -45,7 +45,8 @@ rte_ether_unformat_addr(const char *s, struct
> rte_ether_addr *ea)
> if (n == 6) {
> /* Standard format XX:XX:XX:XX:XX:XX */
> if (o0 > UINT8_MAX || o1 > UINT8_MAX || o2 > UINT8_MAX ||
> - o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX) {
> + o3 > UINT8_MAX || o4 > UINT8_MAX || o5 > UINT8_MAX ||
> + strlen(s) != RTE_ETHER_ADDR_FMT_SIZE - 1) {
> rte_errno = ERANGE;
> return -1;
> }
> @@ -58,7 +59,8 @@ rte_ether_unformat_addr(const char *s, struct
> rte_ether_addr *ea)
> ea->addr_bytes[5] = o5;
> } else if (n == 3) {
> /* Support the format XXXX:XXXX:XXXX */
> - if (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX) {
> + if (o0 > UINT16_MAX || o1 > UINT16_MAX || o2 > UINT16_MAX ||
> + strlen(s) != RTE_ETHER_ADDR_FMT_SIZE - 4) {
> rte_errno = ERANGE;
> return -1;
> }
NAK
Skipping leading zero should be ok. There is no need for this patch.
The current behavior is superset of what standard ether_aton accepts.
