summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-03-26 13:11:14 +0100
committerMichael Adam <obnox@samba.org>2015-03-26 14:54:20 +0100
commit508b45fca93ca2dfb048fdf7465602bc34df42db (patch)
tree845c5765a54bc234d7897e0adcd12d888dbc71a3
parent93d4e801298d8ebb7261adbfc2bdb1a5fbe7115c (diff)
downloadsamba-508b45fca93ca2dfb048fdf7465602bc34df42db.tar.gz
samba-508b45fca93ca2dfb048fdf7465602bc34df42db.tar.bz2
samba-508b45fca93ca2dfb048fdf7465602bc34df42db.zip
ctdb: Fix CID 1125615 Copy into fixed size buffer
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>
-rw-r--r--ctdb/tests/src/ctdb_test_stubs.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ctdb/tests/src/ctdb_test_stubs.c b/ctdb/tests/src/ctdb_test_stubs.c
index 3ea508a0f32..a9947b16f04 100644
--- a/ctdb/tests/src/ctdb_test_stubs.c
+++ b/ctdb/tests/src/ctdb_test_stubs.c
@@ -597,7 +597,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++;