From 6dd5b77a157de19c299e64915367819757df2e91 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 29 Aug 2020 11:18:10 +0000 Subject: [PATCH] Use sbuf_cat instead of sbuf_cpy sbuf_cpy doesn't work with sysctl sbufs because of the drain function. --- sys/kern/subr_bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index f905feff1b56..d333c304a75a 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -267,10 +267,10 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS) sbuf_new_for_sysctl(&sb, NULL, 1024, req); switch (arg2) { case DEVICE_SYSCTL_DESC: - sbuf_cpy(&sb, dev->desc ? dev->desc : ""); + sbuf_cat(&sb, dev->desc ? dev->desc : ""); break; case DEVICE_SYSCTL_DRIVER: - sbuf_cpy(&sb, dev->driver ? dev->driver->name : ""); + sbuf_cat(&sb, dev->driver ? dev->driver->name : ""); break; case DEVICE_SYSCTL_LOCATION: bus_child_location_sb(dev, &sb); @@ -279,7 +279,7 @@ device_sysctl_handler(SYSCTL_HANDLER_ARGS) bus_child_pnpinfo_sb(dev, &sb); break; case DEVICE_SYSCTL_PARENT: - sbuf_cpy(&sb, dev->parent ? dev->parent->nameunit : ""); + sbuf_cat(&sb, dev->parent ? dev->parent->nameunit : ""); break; default: sbuf_delete(&sb);