Page MenuHomeFreeBSD
Files F109621543

D48881.diff
No OneTemporary
Actions

D48881.diff
View Options

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1885,8 +1885,7 @@
sysctl_handle_string(SYSCTL_HANDLER_ARGS)
{
char *tmparg;
- size_t outlen;
- int error = 0, ro_string = 0;
+ int error = 0;
/*
* If the sysctl isn't writable and isn't a preallocated tunable that
@@ -1898,33 +1897,33 @@
*/
if ((oidp->oid_kind & (CTLFLAG_WR | CTLFLAG_TUN)) == 0 ||
arg2 == 0 || kdb_active) {
- arg2 = strlen((char *)arg1) + 1;
- ro_string = 1;
- }
+ size_t outlen;
- if (req->oldptr != NULL) {
- if (ro_string) {
- tmparg = arg1;
- outlen = strlen(tmparg) + 1;
- } else {
+ if (arg2 == 0)
+ outlen = arg2 = strlen(arg1) + 1;
+ else
+ outlen = strnlen(arg1, arg2 - 1) + 1;
+
+ tmparg = req->oldptr != NULL ? arg1 : NULL;
+ error = SYSCTL_OUT(req, tmparg, outlen);
+ } else {
+ size_t outlen;
+
+ if (req->oldptr != NULL) {
tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK);
sx_slock(&sysctlstringlock);
memcpy(tmparg, arg1, arg2);
sx_sunlock(&sysctlstringlock);
- outlen = strlen(tmparg) + 1;
+ outlen = strnlen(tmparg, arg2 - 1) + 1;
+ } else {
+ tmparg = NULL;
+ sx_slock(&sysctlstringlock);
+ outlen = strnlen(arg1, arg2 - 1) + 1;
+ sx_sunlock(&sysctlstringlock);
}
-
error = SYSCTL_OUT(req, tmparg, outlen);
-
- if (!ro_string)
+ if (tmparg != NULL)
free(tmparg, M_SYSCTLTMP);
- } else {
- if (!ro_string)
- sx_slock(&sysctlstringlock);
- outlen = strlen((char *)arg1) + 1;
- if (!ro_string)
- sx_sunlock(&sysctlstringlock);
- error = SYSCTL_OUT(req, NULL, outlen);
}
if (error || !req->newptr)
return (error);

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 8, 2:19 PM (15 h, 2 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16526065
Default Alt Text
D48881.diff (1 KB)

Event Timeline