[PR #6200] [MERGED] landlock: fix struct initialization #5871

New issue

Closed

opened 2026-05-05 10:46:27 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 10:46:27 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/netblue30/firejail/pull/6200
Author: @kmk3
Created: 2/7/2024
Status: ✅ Merged
Merged: 2/8/2024
Merged by: @kmk3

Base: master ← Head: landlock-fix-struct-init

📝 Commits (1)

07163dd landlock: fix struct initialization

📊 Changes

1 file changed (+2 additions, -2 deletions)

View changed files

📝 src/firejail/landlock.c (+2 -2)

📄 Description

Recently (as of Landlock ABI 4), the handled_access_net field was
added to the landlock_ruleset_attr struct in the Linux kernel (in
linux/landlock.h). In src/firejail/landlock.c, that field is not being
set in the struct (as we currently do not use it) before passing it to
the landlock_create_full_ruleset syscall, so it is likely to contain
random garbage when used, resulting in the syscall returning EINVAL:

$ firejail --debug --profile=/etc/firejail/landlock-common.inc \
  --landlock.enforce true
[...]
ll_is_supported: Detected Landlock ABI version 4
ll_restrict: Starting Landlock restrict
ll_create_full_ruleset: Creating Landlock ruleset (abi=4 fs=1fff)
Error: ll_create_full_ruleset: failed to create Landlock ruleset (abi=4 fs=1fff): Invalid argument
ll_read: Adding Landlock rule (abi=4 fs=c) for /
Error: ll_read: failed to add Landlock rule (abi=4 fs=c) for /: Bad file descriptor
[...]
Not enforcing Landlock

So ensure that all structs in src/firejail/landlock.c are initialized to
0 before using them.

Note: Arch has recently (2024-01-31) updated the linux-api-headers
package from version 6.4-1 to 6.7-1[1]. The former version is not affected
(as it does not contain the extra struct field in linux/landlock.h),
while the latter is.

Fixes #6195.

Relates to #6078.

[1] b4223b0c2b

Reported-by: @curiosityseeker

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/netblue30/firejail/pull/6200 **Author:** [@kmk3](https://github.com/kmk3) **Created:** 2/7/2024 **Status:** ✅ Merged **Merged:** 2/8/2024 **Merged by:** [@kmk3](https://github.com/kmk3) **Base:** `master` ← **Head:** `landlock-fix-struct-init` --- ### 📝 Commits (1) - [`07163dd`](https://github.com/netblue30/firejail/commit/07163ddf930633867f8b6d5a39f81046c94d9ab5) landlock: fix struct initialization ### 📊 Changes **1 file changed** (+2 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `src/firejail/landlock.c` (+2 -2) </details> ### 📄 Description Recently (as of Landlock ABI 4), the `handled_access_net` field was added to the `landlock_ruleset_attr` struct in the Linux kernel (in linux/landlock.h). In src/firejail/landlock.c, that field is not being set in the struct (as we currently do not use it) before passing it to the `landlock_create_full_ruleset` syscall, so it is likely to contain random garbage when used, resulting in the syscall returning EINVAL: $ firejail --debug --profile=/etc/firejail/landlock-common.inc \ --landlock.enforce true [...] ll_is_supported: Detected Landlock ABI version 4 ll_restrict: Starting Landlock restrict ll_create_full_ruleset: Creating Landlock ruleset (abi=4 fs=1fff) Error: ll_create_full_ruleset: failed to create Landlock ruleset (abi=4 fs=1fff): Invalid argument ll_read: Adding Landlock rule (abi=4 fs=c) for / Error: ll_read: failed to add Landlock rule (abi=4 fs=c) for /: Bad file descriptor [...] Not enforcing Landlock So ensure that all structs in src/firejail/landlock.c are initialized to 0 before using them. Note: Arch has recently (2024-01-31) updated the linux-api-headers package from version 6.4-1 to 6.7-1[1]. The former version is not affected (as it does not contain the extra struct field in linux/landlock.h), while the latter is. Fixes #6195. Relates to #6078. [1] https://gitlab.archlinux.org/archlinux/packaging/packages/linux-api-headers/-/commit/b4223b0c2bfba54c26acc4dc289415b81b15989f Reported-by: @curiosityseeker --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

gitea-mirror

2026-05-05 10:46:27 -06:00

closed this issue
added the
pull-request
label

gitea-mirror referenced this issue

2026-05-05 10:51:28 -06:00

[PR #6716] [MERGED] modif: use "Error:" in errExit message #6137

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/firejail#5871

No description provided.

Rows
Columns