diff mbox series

[ovs-dev] ovn-trace: Fix copy-paste error for tracing put_nd_ra_opts().

Message ID 20241001130012.380645-1-amusil@redhat.com
State Accepted
Headers show
Series [ovs-dev] ovn-trace: Fix copy-paste error for tracing put_nd_ra_opts(). | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Ales Musil Oct. 1, 2024, 1 p.m. UTC
The nd_ra_opts() would try to pull put_dhcpv6_opts() instead which
would lead to assert and crash of the ovn-trace:

ovn-trace: ./include/ovn/actions.h:601: assertion ovnact->type == OVNACT_PUT_DHCPV6_OPTS failed in ovnact_get_PUT_DHCPV6_OPTS()

Fixes: ec5bcc68b34e ("ovn-controller: Add a new action - 'put_nd_ra_opts'")
Signed-off-by: Ales Musil <amusil@redhat.com>
---
 utilities/ovn-trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Numan Siddique Oct. 17, 2024, 1:41 p.m. UTC | #1
On Tue, Oct 1, 2024 at 9:00 AM Ales Musil <amusil@redhat.com> wrote:
>
> The nd_ra_opts() would try to pull put_dhcpv6_opts() instead which
> would lead to assert and crash of the ovn-trace:
>
> ovn-trace: ./include/ovn/actions.h:601: assertion ovnact->type == OVNACT_PUT_DHCPV6_OPTS failed in ovnact_get_PUT_DHCPV6_OPTS()
>
> Fixes: ec5bcc68b34e ("ovn-controller: Add a new action - 'put_nd_ra_opts'")
> Signed-off-by: Ales Musil <amusil@redhat.com>

Thanks.  Applied to main and backported till 23.09.

Numan

> ---
>  utilities/ovn-trace.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c
> index 13a4ea490..f9cc2463b 100644
> --- a/utilities/ovn-trace.c
> +++ b/utilities/ovn-trace.c
> @@ -3308,7 +3308,7 @@ trace_actions(const struct ovnact *ovnacts, size_t ovnacts_len,
>              break;
>
>          case OVNACT_PUT_ND_RA_OPTS:
> -            execute_put_nd_ra_opts(ovnact_get_PUT_DHCPV6_OPTS(a),
> +            execute_put_nd_ra_opts(ovnact_get_PUT_ND_RA_OPTS(a),
>                                     "put_nd_ra_opts", uflow, super);
>              break;
>
> --
> 2.46.0
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
diff mbox series

Patch

diff --git a/utilities/ovn-trace.c b/utilities/ovn-trace.c
index 13a4ea490..f9cc2463b 100644
--- a/utilities/ovn-trace.c
+++ b/utilities/ovn-trace.c
@@ -3308,7 +3308,7 @@  trace_actions(const struct ovnact *ovnacts, size_t ovnacts_len,
             break;
 
         case OVNACT_PUT_ND_RA_OPTS:
-            execute_put_nd_ra_opts(ovnact_get_PUT_DHCPV6_OPTS(a),
+            execute_put_nd_ra_opts(ovnact_get_PUT_ND_RA_OPTS(a),
                                    "put_nd_ra_opts", uflow, super);
             break;