bgpd: fix mpls label pointer comparison

Comparing pointers is not the appropriate way to know if the label values are the same or not. Perform a memcmp call instead is better. Fixes: 8ba7105 ("bgpd: fix valgrind flagged errors") Signed-off-by: Philippe Guibert <[email protected]> (cherry picked from commit ad052b3995e6d4bf0bd7e1cf4814afe6ce9876d2) Signed-off-by: Louis Scalbert <[email protected]>
louis-6wind · Jan 25, 2024 · f8c1cd4 · f8c1cd4
1 parent 9b9abe1
commit f8c1cd4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -4710,7 +4710,8 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 		/* Update MPLS label */
 		if (has_valid_label) {
 			extra = bgp_path_info_extra_get(pi);
-			if (extra->label != label) {
+			if (memcmp(&extra->label[0], &label[0],
+				   num_labels * sizeof(mpls_label_t))) {
 				memcpy(&extra->label, label,
 				       num_labels * sizeof(mpls_label_t));
 				extra->num_labels = num_labels;
@@ -4909,7 +4910,8 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id,
 	/* Update MPLS label */
 	if (has_valid_label) {
 		extra = bgp_path_info_extra_get(new);
-		if (extra->label != label) {
+		if (memcmp(&extra->label[0], &label[0],
+			   num_labels * sizeof(mpls_label_t))) {
 			memcpy(&extra->label, label,
 			       num_labels * sizeof(mpls_label_t));
 			extra->num_labels = num_labels;