]> git.proxmox.com Git - mirror_zfs.git/commitdiff
FreeBSD: Fix regression from kmem_scnprintf() in libzfs
authorRichard Yao <richard.yao@alumni.stonybrook.edu>
Tue, 1 Nov 2022 20:58:17 +0000 (16:58 -0400)
committerGitHub <noreply@github.com>
Tue, 1 Nov 2022 20:58:17 +0000 (13:58 -0700)
kmem_scnprintf() is only available in libzpool. Recent buildbot issues
with showing FreeBSD results kept us from seeing this before
97143b9d314d54409244f3995576d8cc8c1ebf0a was merged.

The code has been changed to sanitize the output from `kmem_scnprintf()`.

Reviewed-by: Allan Jude <allan@klarasystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #14111

lib/libzfs/os/freebsd/libzfs_compat.c

index 5e280cbae9354fd29b93a9dc813790023d2900be..d1c1fea7fb68ff825f197a60b4717518cd2b19c3 100644 (file)
@@ -202,8 +202,10 @@ libzfs_error_init(int error)
        size_t msglen = sizeof (errbuf);
 
        if (modfind("zfs") < 0) {
-               size_t len = kmem_scnprintf(msg, msglen, dgettext(TEXT_DOMAIN,
+               size_t len = snprintf(msg, msglen, dgettext(TEXT_DOMAIN,
                    "Failed to load %s module: "), ZFS_KMOD);
+               if (len >= msglen)
+                       len = msglen - 1;
                msg += len;
                msglen -= len;
        }