diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2021-06-06 20:38:48 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2021-06-13 01:22:33 +0000 |
| commit | af3dce614155dd3264c7248e0fd082d2c214890a (patch) | |
| tree | 9b76195db5efdb2fbe4c7294eaec3e025dd8ccf8 | |
| parent | dc107fe1f939c7d4c5575868202b4cd3edf3e846 (diff) | |
| download | src-af3dce614155dd3264c7248e0fd082d2c214890a.tar.gz src-af3dce614155dd3264c7248e0fd082d2c214890a.zip | |
Change the return type of sv__setid_allowed from bool to int
(cherry picked from commit 62b8258a7e43f3c774f13eab758b2cfdf353073e)
| -rw-r--r-- | sys/compat/linux/linux_mib.c | 2 | ||||
| -rw-r--r-- | sys/compat/linux/linux_mib.h | 2 | ||||
| -rw-r--r-- | sys/sys/sysent.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index 3a6627df9abd..13beba323787 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -104,7 +104,7 @@ SYSCTL_BOOL(_compat_linux, OID_AUTO, setid_allowed, CTLFLAG_RWTUN, &linux_setid_allowed, 0, "Allow setuid/setgid on execve of Linux binary"); -bool +int linux_setid_allowed_query(struct thread *td __unused, struct image_params *imgp __unused) { diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index 49da02da44df..8f2b87e5f3a6 100644 --- a/sys/compat/linux/linux_mib.h +++ b/sys/compat/linux/linux_mib.h @@ -71,6 +71,6 @@ extern int linux_preserve_vstatus; extern bool linux_map_sched_prio; struct image_params; -bool linux_setid_allowed_query(struct thread *td, struct image_params *imgp); +int linux_setid_allowed_query(struct thread *td, struct image_params *imgp); #endif /* _LINUX_MIB_H_ */ diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index 4a707b41e020..c2cbd77a92b9 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -148,7 +148,7 @@ struct sysentvec { void (*sv_onexec)(struct proc *, struct image_params *); void (*sv_onexit)(struct proc *); void (*sv_ontdexit)(struct thread *td); - bool (*sv_setid_allowed)(struct thread *td, + int (*sv_setid_allowed)(struct thread *td, struct image_params *imgp); }; |