osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/dahdi-linux/+/42906?usp=email )
Change subject: Adjust to strncpy removal in linux 7.2-rc1 ......................................................................
Adjust to strncpy removal in linux 7.2-rc1
Related: https://docs.kernel.org/process/deprecated.html#strncpy Related: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i... Change-Id: I860344fd23d5780fc588d19388ad91c6f6bcfc90 --- M drivers/dahdi/dahdi-base.c M drivers/dahdi/xpp/mmapbus.c M drivers/dahdi/xpp/mmapdrv.c 3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/dahdi-linux refs/changes/06/42906/1
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 657eb34..5067c02 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -5449,7 +5449,7 @@ */ continue; } - strncpy(vi.echo_canceller, ec_name, space); + strscpy(vi.echo_canceller, ec_name, sizeof(vi.echo_canceller)); space -= strlen(ec_name); if (space < 1) break; diff --git a/drivers/dahdi/xpp/mmapbus.c b/drivers/dahdi/xpp/mmapbus.c index ddf083f..72c402e 100644 --- a/drivers/dahdi/xpp/mmapbus.c +++ b/drivers/dahdi/xpp/mmapbus.c @@ -40,7 +40,7 @@ dev->dev.bus = &mmap_bus_type; dev->dev.parent = &mmap_bus; dev->dev.release = mmap_dev_release; - strncpy(dev->dev.bus_id, dev->name, BUS_ID_SIZE); + strscpy(dev->dev.bus_id, dev->name, sizeof(dev->dev.bus_id)); return device_register(&dev->dev); } EXPORT_SYMBOL(register_mmap_device); diff --git a/drivers/dahdi/xpp/mmapdrv.c b/drivers/dahdi/xpp/mmapdrv.c index 2e0e298..0124b92 100644 --- a/drivers/dahdi/xpp/mmapdrv.c +++ b/drivers/dahdi/xpp/mmapdrv.c @@ -572,8 +572,8 @@ ret = -ENOMEM; goto fail_xbus; } - strncpy(global_xbus->connector, "mmap", XBUS_DESCLEN); - strncpy(global_xbus->label, "mmap:0", LABEL_SIZE); + strscpy(global_xbus->connector, "mmap", sizeof(global_xbus->connector)); + strscpy(global_xbus->label, "mmap:0", sizeof(global_xbus->label));
xframe_queue_init(&txpool, 10, 200, "mmap_txpool", global_xbus); if (!
-
osmith