]> 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)
committerDonald Sharp <sharpd@nvidia.com>
Mon, 10 Oct 2022 12:04:09 +0000 (08:04 -0400)
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>
ospfclient/ospf_apiclient.c

index 29f1c0807db47618833837a2f0d98e1ac252c88b..51c8a5b8c0657f5a9085573a8d414043f3bb2426 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;