Fix CID 1125615 Copy into fixed size buffer
authorVolker Lendecke <vl@samba.org>
Thu, 26 Mar 2015 12:11:14 +0000 (13:11 +0100)
committerMartin Schwenke <martin@meltin.net>
Wed, 24 Feb 2016 06:00:38 +0000 (17:00 +1100)
Might be a "can't happen", but strcpy always looks fishy

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
(Imported from commit 508b45fca93ca2dfb048fdf7465602bc34df42db)

tests/src/ctdb_test_stubs.c

index 82e82f3a4cc1ccafc7d49624432dfb723a3032a2..c57f6ca301827d045d2bc155e984bd81a555b49d 100644 (file)
@@ -515,7 +515,12 @@ int32_t ctdb_control_get_ifaces(struct ctdb_context *ctdb,
 
        i = 0;
        for (cur=ctdb->ifaces;cur;cur=cur->next) {
-               strcpy(ifaces->ifaces[i].name, cur->name);
+               size_t nlen = strlcpy(ifaces->ifaces[i].name, cur->name,
+                                     sizeof(ifaces->ifaces[i].name));
+               if (nlen >= sizeof(ifaces->ifaces[i].name)) {
+                       /* Ignore invalid name */
+                       continue;
+               }
                ifaces->ifaces[i].link_state = cur->link_up;
                ifaces->ifaces[i].references = cur->references;
                i++;