system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

zfs: Fix SPA sysctl handlers

Browse source 
sbuf_cpy() resets the sbuf state, which is wrong for sbufs allocated by
sbuf_new_for_sysctl().  In particular, this code triggers an assertion
failure in sbuf_clear().

Simplify by just using sysctl_handle_string() for both reading and
setting the tunable.

Apply to FreeBSD directly since this bug causes "sysctl -a" to crash the
kernel.

PR:		276039
Reported by:	pho
Reviewed by:	mav
Pull Request:	https://github.com/openzfs/zfs/pull/15719
This commit is contained in:
Mark Johnston 2024-01-01 13:54:15 -05:00
parent 499e84e16f
commit 09af4bf2c9
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sys/contrib/openzfs/module/zfs/spa.c
View file

@ -1445,8 +1445,6 @@ spa_taskq_write_param_get(char *buf, zfs_kernel_param_t *kp)
return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf)); return (spa_taskq_param_get(ZIO_TYPE_WRITE, buf));
} }
#else #else
#include <sys/sbuf.h>
/* /*
* On FreeBSD load-time parameters can be set up before malloc() is available, * On FreeBSD load-time parameters can be set up before malloc() is available,
* so we have to do all the parsing work on the stack. * so we have to do all the parsing work on the stack.
@ -1457,19 +1455,11 @@ static int
spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS) spa_taskq_read_param(ZFS_MODULE_PARAM_ARGS)
{ {
char buf[SPA_TASKQ_PARAM_MAX]; char buf[SPA_TASKQ_PARAM_MAX];
int err = 0; int err;
if (req->newptr == NULL) {
int len = spa_taskq_param_get(ZIO_TYPE_READ, buf);
struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
sbuf_cpy(s, buf);
err = sbuf_finish(s);
sbuf_delete(s);
return (err);
}
(void) spa_taskq_param_get(ZIO_TYPE_READ, buf);
err = sysctl_handle_string(oidp, buf, sizeof (buf), req); err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
if (err) if (err || req->newptr == NULL)
return (err); return (err);
return (spa_taskq_param_set(ZIO_TYPE_READ, buf)); return (spa_taskq_param_set(ZIO_TYPE_READ, buf));
} }
@ -1478,19 +1468,11 @@ static int
spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS) spa_taskq_write_param(ZFS_MODULE_PARAM_ARGS)
{ {
char buf[SPA_TASKQ_PARAM_MAX]; char buf[SPA_TASKQ_PARAM_MAX];
int err = 0; int err;
if (req->newptr == NULL) {
int len = spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
struct sbuf *s = sbuf_new_for_sysctl(NULL, NULL, len+1, req);
sbuf_cpy(s, buf);
err = sbuf_finish(s);
sbuf_delete(s);
return (err);
}
(void) spa_taskq_param_get(ZIO_TYPE_WRITE, buf);
err = sysctl_handle_string(oidp, buf, sizeof (buf), req); err = sysctl_handle_string(oidp, buf, sizeof (buf), req);
if (err) if (err || req->newptr == NULL)
return (err); return (err);
return (spa_taskq_param_set(ZIO_TYPE_WRITE, buf)); return (spa_taskq_param_set(ZIO_TYPE_WRITE, buf));
} }