aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-06-06 20:38:48 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2021-06-06 20:38:48 +0000
commit62b8258a7e43f3c774f13eab758b2cfdf353073e (patch)
tree7d2f8ba08d85247f33cd7781dcfd69c1eb22f466
parent598f6fb49c9ca688029b79de0a44227ab79c608c (diff)
downloadsrc-62b8258a7e43f3c774f13eab758b2cfdf353073e.tar.gz
src-62b8258a7e43f3c774f13eab758b2cfdf353073e.zip
Change the return type of sv__setid_allowed from bool to int
to please some userspace code using sys/sysent.h. Sponsored by: The FreeBSD Foundation MFC after: 1 week
-rw-r--r--sys/compat/linux/linux_mib.c2
-rw-r--r--sys/compat/linux/linux_mib.h2
-rw-r--r--sys/sys/sysent.h2
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 adf71cb65401..61a3a38a23ae 100644
--- a/sys/compat/linux/linux_mib.h
+++ b/sys/compat/linux/linux_mib.h
@@ -72,6 +72,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);
};