mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 11:29:36 +03:00
7584fbe846
Coverity found a bug in `zfs_secpolicy_create_clone()` where it is
possible for us to pass an unterminated string when `zfs_get_parent()`
returns an error. Upon inspection, it is clear that using `strlcpy()`
would have avoided this issue.
Looking at the codebase, there are a number of other uses of `strncpy()`
that are unsafe and even when it is used safely, switching to
`strlcpy()` would make the code more readable. Therefore, we switch all
instances where we use `strncpy()` to use `strlcpy()`.
Unfortunately, we do not portably have access to `strlcpy()` in
tests/zfs-tests/cmd/zfs_diff-socket.c because it does not link to
libspl. Modifying the appropriate Makefile.am to try to link to it
resulted in an error from the naming choice used in the file. Trying to
disable the check on the file did not work on FreeBSD because Clang
ignores `#undef` when a definition is provided by `-Dstrncpy(...)=...`.
We workaround that by explictly including the C file from libspl into
the test. This makes things build correctly everywhere.
We add a deprecation warning to `config/Rules.am` and suppress it on the
remaining `strncpy()` usage. `strlcpy()` is not portably avaliable in
tests/zfs-tests/cmd/zfs_diff-socket.c, so we use `snprintf()` there as a
substitute.
This patch does not tackle the related problem of `strcpy()`, which is
even less safe. Thankfully, a quick inspection found that it is used far
more correctly than strncpy() was used. A quick inspection did not find
any problems with `strcpy()` usage outside of zhack, but it should be
said that I only checked around 90% of them.
Lastly, some of the fields in kstat_t varied in size by 1 depending on
whether they were in userspace or in the kernel. The origin of this
discrepancy appears to be 04a479f706
where
it was made for no apparent reason. It conflicts with the comment on
KSTAT_STRLEN, so we shrink the kernel field sizes to match the userspace
field sizes.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Closes #13876
208 lines
5.3 KiB
C
208 lines
5.3 KiB
C
/*
|
|
* Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC.
|
|
* Copyright (C) 2007 The Regents of the University of California.
|
|
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
|
|
* Written by Brian Behlendorf <behlendorf1@llnl.gov>.
|
|
* UCRL-CODE-235197
|
|
*
|
|
* This file is part of the SPL, Solaris Porting Layer.
|
|
*
|
|
* The SPL is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* The SPL is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with the SPL. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Solaris Porting Layer (SPL) Thread Implementation.
|
|
*/
|
|
|
|
#include <sys/thread.h>
|
|
#include <sys/kmem.h>
|
|
#include <sys/tsd.h>
|
|
|
|
/*
|
|
* Thread interfaces
|
|
*/
|
|
typedef struct thread_priv_s {
|
|
unsigned long tp_magic; /* Magic */
|
|
int tp_name_size; /* Name size */
|
|
char *tp_name; /* Name (without _thread suffix) */
|
|
void (*tp_func)(void *); /* Registered function */
|
|
void *tp_args; /* Args to be passed to function */
|
|
size_t tp_len; /* Len to be passed to function */
|
|
int tp_state; /* State to start thread at */
|
|
pri_t tp_pri; /* Priority to start threat at */
|
|
} thread_priv_t;
|
|
|
|
static int
|
|
thread_generic_wrapper(void *arg)
|
|
{
|
|
thread_priv_t *tp = (thread_priv_t *)arg;
|
|
void (*func)(void *);
|
|
void *args;
|
|
|
|
ASSERT(tp->tp_magic == TP_MAGIC);
|
|
func = tp->tp_func;
|
|
args = tp->tp_args;
|
|
set_current_state(tp->tp_state);
|
|
set_user_nice((kthread_t *)current, PRIO_TO_NICE(tp->tp_pri));
|
|
kmem_free(tp->tp_name, tp->tp_name_size);
|
|
kmem_free(tp, sizeof (thread_priv_t));
|
|
|
|
if (func)
|
|
func(args);
|
|
|
|
return (0);
|
|
}
|
|
|
|
/*
|
|
* thread_create() may block forever if it cannot create a thread or
|
|
* allocate memory. This is preferable to returning a NULL which Solaris
|
|
* style callers likely never check for... since it can't fail.
|
|
*/
|
|
kthread_t *
|
|
__thread_create(caddr_t stk, size_t stksize, thread_func_t func,
|
|
const char *name, void *args, size_t len, proc_t *pp, int state, pri_t pri)
|
|
{
|
|
thread_priv_t *tp;
|
|
struct task_struct *tsk;
|
|
char *p;
|
|
|
|
/* Option pp is simply ignored */
|
|
/* Variable stack size unsupported */
|
|
ASSERT(stk == NULL);
|
|
|
|
tp = kmem_alloc(sizeof (thread_priv_t), KM_PUSHPAGE);
|
|
if (tp == NULL)
|
|
return (NULL);
|
|
|
|
tp->tp_magic = TP_MAGIC;
|
|
tp->tp_name_size = strlen(name) + 1;
|
|
|
|
tp->tp_name = kmem_alloc(tp->tp_name_size, KM_PUSHPAGE);
|
|
if (tp->tp_name == NULL) {
|
|
kmem_free(tp, sizeof (thread_priv_t));
|
|
return (NULL);
|
|
}
|
|
|
|
strlcpy(tp->tp_name, name, tp->tp_name_size);
|
|
|
|
/*
|
|
* Strip trailing "_thread" from passed name which will be the func
|
|
* name since the exposed API has no parameter for passing a name.
|
|
*/
|
|
p = strstr(tp->tp_name, "_thread");
|
|
if (p)
|
|
p[0] = '\0';
|
|
|
|
tp->tp_func = func;
|
|
tp->tp_args = args;
|
|
tp->tp_len = len;
|
|
tp->tp_state = state;
|
|
tp->tp_pri = pri;
|
|
|
|
tsk = spl_kthread_create(thread_generic_wrapper, (void *)tp,
|
|
"%s", tp->tp_name);
|
|
if (IS_ERR(tsk))
|
|
return (NULL);
|
|
|
|
wake_up_process(tsk);
|
|
return ((kthread_t *)tsk);
|
|
}
|
|
EXPORT_SYMBOL(__thread_create);
|
|
|
|
/*
|
|
* spl_kthread_create - Wrapper providing pre-3.13 semantics for
|
|
* kthread_create() in which it is not killable and less likely
|
|
* to return -ENOMEM.
|
|
*/
|
|
struct task_struct *
|
|
spl_kthread_create(int (*func)(void *), void *data, const char namefmt[], ...)
|
|
{
|
|
struct task_struct *tsk;
|
|
va_list args;
|
|
char name[TASK_COMM_LEN];
|
|
|
|
va_start(args, namefmt);
|
|
vsnprintf(name, sizeof (name), namefmt, args);
|
|
va_end(args);
|
|
do {
|
|
tsk = kthread_create(func, data, "%s", name);
|
|
if (IS_ERR(tsk)) {
|
|
if (signal_pending(current)) {
|
|
clear_thread_flag(TIF_SIGPENDING);
|
|
continue;
|
|
}
|
|
if (PTR_ERR(tsk) == -ENOMEM)
|
|
continue;
|
|
return (NULL);
|
|
} else {
|
|
return (tsk);
|
|
}
|
|
} while (1);
|
|
}
|
|
EXPORT_SYMBOL(spl_kthread_create);
|
|
|
|
/*
|
|
* The "why" argument indicates the allowable side-effects of the call:
|
|
*
|
|
* FORREAL: Extract the next pending signal from p_sig into p_cursig;
|
|
* stop the process if a stop has been requested or if a traced signal
|
|
* is pending.
|
|
*
|
|
* JUSTLOOKING: Don't stop the process, just indicate whether or not
|
|
* a signal might be pending (FORREAL is needed to tell for sure).
|
|
*/
|
|
int
|
|
issig(int why)
|
|
{
|
|
ASSERT(why == FORREAL || why == JUSTLOOKING);
|
|
|
|
if (!signal_pending(current))
|
|
return (0);
|
|
|
|
if (why != FORREAL)
|
|
return (1);
|
|
|
|
struct task_struct *task = current;
|
|
spl_kernel_siginfo_t __info;
|
|
sigset_t set;
|
|
siginitsetinv(&set, 1ULL << (SIGSTOP - 1) | 1ULL << (SIGTSTP - 1));
|
|
sigorsets(&set, &task->blocked, &set);
|
|
|
|
spin_lock_irq(&task->sighand->siglock);
|
|
int ret;
|
|
#ifdef HAVE_DEQUEUE_SIGNAL_4ARG
|
|
enum pid_type __type;
|
|
if ((ret = dequeue_signal(task, &set, &__info, &__type)) != 0) {
|
|
#else
|
|
if ((ret = dequeue_signal(task, &set, &__info)) != 0) {
|
|
#endif
|
|
#ifdef HAVE_SIGNAL_STOP
|
|
spin_unlock_irq(&task->sighand->siglock);
|
|
kernel_signal_stop();
|
|
#else
|
|
if (current->jobctl & JOBCTL_STOP_DEQUEUED)
|
|
spl_set_special_state(TASK_STOPPED);
|
|
|
|
spin_unlock_irq(¤t->sighand->siglock);
|
|
|
|
schedule();
|
|
#endif
|
|
return (0);
|
|
}
|
|
|
|
spin_unlock_irq(&task->sighand->siglock);
|
|
|
|
return (1);
|
|
}
|
|
|
|
EXPORT_SYMBOL(issig);
|