From 3bb01a499bb828a8705d5f1772732ef5de18254c Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 4 Mar 2022 16:19:42 +0100 Subject: [PATCH 1/2] Fix regression in derived-mode-init-mode-variables * lisp/emacs-lisp/derived.el (derived-mode-init-mode-variables): Fix regression caused by lexical-binding derived.el (bug#54240). --- lisp/emacs-lisp/derived.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el index dd386f14b7a..72f49bf3baf 100644 --- a/lisp/emacs-lisp/derived.el +++ b/lisp/emacs-lisp/derived.el @@ -409,7 +409,7 @@ the first time the mode is used." t (eval `(defvar ,(derived-mode-abbrev-table-name mode) (progn - (define-abbrev-table (derived-mode-abbrev-table-name mode) nil) + (define-abbrev-table (derived-mode-abbrev-table-name ',mode) nil) (make-abbrev-table)) ,(format "Abbrev table for %s." mode))))) From 0090318c6113828688e84fc50a13a8d9c5f71c55 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 5 Mar 2022 13:44:08 +0100 Subject: [PATCH 2/2] * lib-src/seccomp-filter.c (main): Use faccessat2 only if defined. --- lib-src/seccomp-filter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib-src/seccomp-filter.c b/lib-src/seccomp-filter.c index d368cbb46c8..b5158510104 100644 --- a/lib-src/seccomp-filter.c +++ b/lib-src/seccomp-filter.c @@ -240,7 +240,9 @@ main (int argc, char **argv) should be further restricted using mount namespaces. */ RULE (SCMP_ACT_ALLOW, SCMP_SYS (access)); RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat)); +#ifdef __NR_faccessat2 RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat2)); +#endif RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat)); RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat64)); RULE (SCMP_ACT_ALLOW, SCMP_SYS (lstat));