Merge ~michal-maloszewski99/ubuntu/+source/frr:jammy-resolve-strncmp-warnings into ubuntu/+source/frr:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/ppa-frr-jammy-lp1959896

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/?format=plain)
  frr @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/jammy/amd64/f/frr/20230824_222707_3523c@/log.gz
    24.08.23 22:27:07 ✅ Triggers: frr/8.1-1ubuntu1.5~ppa1
  frr @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/jammy/arm64/f/frr/20230824_223551_9d301@/log.gz
    24.08.23 22:35:51 ✅ Triggers: frr/8.1-1ubuntu1.5~ppa1
  frr @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/jammy/armhf/f/frr/20230825_192045_1c70a@/log.gz
    25.08.23 19:20:45 ✅ Triggers: frr/8.1-1ubuntu1.5~ppa1
  frr @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/jammy/ppc64el/f/frr/20230824_222724_1c236@/log.gz
    24.08.23 22:27:24 ✅ Triggers: frr/8.1-1ubuntu1.5~ppa1
  frr @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-jammy-michal-maloszewski99-ppa-frr-jammy-lp1959896/jammy/s390x/f/frr/20230824_233826_e9c9b@/log.gz
    24.08.23 23:38:26 ✅ Triggers: frr/8.1-1ubuntu1.5~ppa1
Running: (none)
Waiting: (none)

[Michał Małoszewski (michal-maloszewski99)]

Please review.

Unmerged commits

0cf84e1... by Michał Małoszewski on 2023-08-24

changelog

e79b2d2... by Michał Małoszewski on 2023-08-24

* d/p/resolve-strncmp-warnings.patch: Fix the strncmp warning by
  getting rid of the sizeof operator that determines the size of
  the data structure. (LP: #1959896)

diff --git a/debian/changelog b/debian/changelog
index fef9ee7..edec9d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+frr (8.1-1ubuntu1.5) jammy; urgency=medium
+
+  * d/p/resolve-strncmp-warnings.patch: Fix the strncmp warning by
+    getting rid of the sizeof operator that determines the size of
+    the data structure. (LP: #1959896)
+
+ -- Michal Maloszewski <[e-mail]>  Thu, 24 Aug 2023 13:52:20 +0200
+
 frr (8.1-1ubuntu1.4) jammy-security; urgency=medium
 
   * SECURITY UPDATE: denial of service via bgp_attr_psid_sub()
diff --git a/debian/patches/resolve-strncmp-warnings.patch b/debian/patches/resolve-strncmp-warnings.patch
new file mode 100644
index 0000000..5c122d2
--- /dev/null
+++ b/debian/patches/resolve-strncmp-warnings.patch
@@ -0,0 +1,40 @@
+From c975f1a5e405f7a74d45519862388cd9ea8ce782 Mon Sep 17 00:00:00 2001
+From: Quentin Young <[e-mail]>
+Date: Wed, 2 Feb 2022 16:34:03 -0500
+Subject: [PATCH] bgpd: strncmp -> strcmp in community hash foo
+
+buffers are null terminated
+
+Origin: upstream, https://github.com/FRRouting/frr/pull/10485/commits/c975f1a5e405f7a74d45519862388cd9ea8ce782
+Bug: https://github.com/FRRouting/frr/issues/10484
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/frr/+bug/1959896
+Last-Update: 2023-08-24
+---
+ bgpd/bgp_community_alias.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/bgpd/bgp_community_alias.c b/bgpd/bgp_community_alias.c
+index 793f3ac9ac1c..2c86efb5a028 100644
+--- a/bgpd/bgp_community_alias.c
++++ b/bgpd/bgp_community_alias.c
+@@ -40,9 +40,7 @@ static bool bgp_ca_community_hash_cmp(const void *p1, const void *p2)
+ 	const struct community_alias *ca1 = p1;
+ 	const struct community_alias *ca2 = p2;
+ 
+-	return (strncmp(ca1->community, ca2->community,
+-			sizeof(struct community_alias))
+-		== 0);
++	return (strcmp(ca1->community, ca2->community) == 0);
+ }
+ 
+ static unsigned int bgp_ca_alias_hash_key(const void *p)
+@@ -57,8 +55,7 @@ static bool bgp_ca_alias_hash_cmp(const void *p1, const void *p2)
+ 	const struct community_alias *ca1 = p1;
+ 	const struct community_alias *ca2 = p2;
+ 
+-	return (strncmp(ca1->alias, ca2->alias, sizeof(struct community_alias))
+-		== 0);
++	return (strcmp(ca1->alias, ca2->alias) == 0);
+ }
+ 
+ static void *bgp_community_alias_alloc(void *p)
diff --git a/debian/patches/series b/debian/patches/series
index 27231b6..bbdbc38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ disable_isisd_fuzz_test.patch
 CVE-2022-37032.patch
 CVE-2022-37035.patch
 CVE-2023-31490.patch
+resolve-strncmp-warnings.patch