]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospfclient: Ensure ospf_apiclient_lsa_originate cannot accidently write into stack
authorDonald Sharp <sharpd@nvidia.com>
Wed, 20 Jul 2022 20:43:17 +0000 (16:43 -0400)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Tue, 11 Oct 2022 10:38:53 +0000 (10:38 +0000)
Even though OSPF_MAX_LSA_SIZE is quite large and holds the upper bound
on what can be written into a lsa, let's add a small check to ensure
it is not possible to do a bad thing.

This wins one of the long standing bug awards.  2003!

Fixes: #11602
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit d2aeac38708d93fb028d6a53e6eea317f0c06d1b)

ospfclient/ospf_apiclient.c

index e84c6f5b3c975f51187a812dfd7b75ee9323c049..41f0b25b916c8cac18f476e79036be693f379fb0 100644 (file)
@@ -447,6 +447,12 @@ int ospf_apiclient_lsa_originate(struct ospf_apiclient *oclient,
                return OSPF_API_ILLEGALLSATYPE;
        }
 
+       if ((size_t)opaquelen > sizeof(buf) - sizeof(struct lsa_header)) {
+               fprintf(stderr, "opaquelen(%d) is larger than buf size %zu\n",
+                       opaquelen, sizeof(buf));
+               return OSPF_API_NOMEMORY;
+       }
+
        /* Make a new LSA from parameters */
        lsah = (struct lsa_header *)buf;
        lsah->ls_age = 0;