mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 21:06:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/0.5.1'

Browse source
This commit is contained in:
Sebastian Ramacher 2022-09-09 00:17:27 +02:00
commit c7182822c9
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -1,5 +1,5 @@
project('zathura', 'c', project('zathura', 'c',
version: '0.5.0', version: '0.5.1',
meson_version: '>=0.56', meson_version: '>=0.56',
default_options: ['c_std=c11', 'warning_level=3'], default_options: ['c_std=c11', 'warning_level=3'],
) )

5
zathura/seccomp-filters.c
View file

@ -247,7 +247,6 @@ seccomp_enable_strict_filter(zathura_t* zathura)
GdkDisplay* display = gtk_widget_get_display(zathura->ui.session->gtk.view); GdkDisplay* display = gtk_widget_get_display(zathura->ui.session->gtk.view);
if (GDK_IS_X11_DISPLAY (display)) { if (GDK_IS_X11_DISPLAY (display)) {
girara_debug("On X11, supporting X11 syscalls"); girara_debug("On X11, supporting X11 syscalls");
/* permit the socket syscall for local UNIX domain sockets (required by X11) */ /* permit the socket syscall for local UNIX domain sockets (required by X11) */
@ -275,7 +274,8 @@ seccomp_enable_strict_filter(zathura_t* zathura)
CLONE_SETTLS | \ CLONE_SETTLS | \
CLONE_PARENT_SETTID | \ CLONE_PARENT_SETTID | \
CLONE_CHILD_CLEARTID)); CLONE_CHILD_CLEARTID));
/* trigger fallback to clone */
ADD_RULE("errno", SCMP_ACT_ERRNO(ENOSYS), clone3, 0);
/* fcntl filter - not yet working */ /* fcntl filter - not yet working */
/*ADD_RULE("allow", SCMP_ACT_ALLOW, fcntl, 1, SCMP_CMP(0, SCMP_CMP_EQ, \ /*ADD_RULE("allow", SCMP_ACT_ALLOW, fcntl, 1, SCMP_CMP(0, SCMP_CMP_EQ, \
@ -288,7 +288,6 @@ seccomp_enable_strict_filter(zathura_t* zathura)
F_SETFD | \ F_SETFD | \
FD_CLOEXEC )); */ FD_CLOEXEC )); */
/* Special requirements for ioctl, allowed on stdout/stderr */ /* Special requirements for ioctl, allowed on stdout/stderr */
ADD_RULE("allow", SCMP_ACT_ALLOW, ioctl, 1, SCMP_CMP(0, SCMP_CMP_EQ, 1)); ADD_RULE("allow", SCMP_ACT_ALLOW, ioctl, 1, SCMP_CMP(0, SCMP_CMP_EQ, 1));
ADD_RULE("allow", SCMP_ACT_ALLOW, ioctl, 1, SCMP_CMP(0, SCMP_CMP_EQ, 2)); ADD_RULE("allow", SCMP_ACT_ALLOW, ioctl, 1, SCMP_CMP(0, SCMP_CMP_EQ, 2));