Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] base-files: disable unprivileged eBPF by default.
@ 2021-04-22 14:40 leahneukirchen
  2021-04-22 14:47 ` leahneukirchen
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: leahneukirchen @ 2021-04-22 14:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages unpriv-ebpf
https://github.com/void-linux/void-packages/pull/30424

base-files: disable unprivileged eBPF by default.
eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30424.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unpriv-ebpf-30424.patch --]
[-- Type: text/x-diff, Size: 1431 bytes --]

From 22c83929afefc3e9afeecad4c203079489400d73 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Apr 2021 16:35:21 +0200
Subject: [PATCH] base-files: disable unprivileged eBPF by default.

eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.
---
 srcpkgs/base-files/files/sysctl.conf | 5 ++++-
 srcpkgs/base-files/template          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 1e1a2768d677..7b73ee862b4e 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -2,7 +2,7 @@
 # User-alterable options are in 10-void-user.conf.
 
 # Append the PID to the core filename
-kernel.core_uses_pid = 1
+kernel.core_uses_pid=1
 
 # Enable hard and soft link protection
 fs.protected_hardlinks=1
@@ -13,3 +13,6 @@ kernel.kptr_restrict=1
 
 # Block non-uid-0 kernel profiling
 kernel.perf_event_paranoid=2
+
+# Block unprivileged use of eBPF
+kernel.unprivileged_bpf_disabled=1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index ff629498408b..9ced039de8d9 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.141
+version=0.142
 revision=11
 bootstrap=yes
 depends="xbps-triggers"

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
@ 2021-04-22 14:47 ` leahneukirchen
  2021-04-22 15:20 ` ericonr
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-04-22 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-824907767

Comment:
Or should this go to `10-void-user.conf`? But then I think `kernel.perf_event_paranoid=2` should go there too.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
  2021-04-22 14:47 ` leahneukirchen
@ 2021-04-22 15:20 ` ericonr
  2021-04-22 15:26 ` leahneukirchen
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-04-22 15:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-824936172

Comment:
hmm, there is one issue with moving old things to the user config. If they don't notice the new file because they changed the user config, they will be missing `kernel.perf_event_paranoid=2` :/

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
  2021-04-22 14:47 ` leahneukirchen
  2021-04-22 15:20 ` ericonr
@ 2021-04-22 15:26 ` leahneukirchen
  2021-04-22 16:00 ` ericonr
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-04-22 15:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-824940806

Comment:
Users are not supposed to fiddle in `/usr/lib/sysctl.d`.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
                   ` (2 preceding siblings ...)
  2021-04-22 15:26 ` leahneukirchen
@ 2021-04-22 16:00 ` ericonr
  2021-05-04 12:12 ` [PR PATCH] [Updated] " leahneukirchen
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-04-22 16:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-824969999

Comment:
Hm, that makes it even worse... I think the file at `/etc/sysctl.d` will shadow the one from the package, and there are no visible signs that a change has been made...

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
                   ` (3 preceding siblings ...)
  2021-04-22 16:00 ` ericonr
@ 2021-05-04 12:12 ` leahneukirchen
  2021-05-04 12:14 ` leahneukirchen
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-05-04 12:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]

There is an updated pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages unpriv-ebpf
https://github.com/void-linux/void-packages/pull/30424

base-files: disable unprivileged eBPF by default.
eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/30424.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-unpriv-ebpf-30424.patch --]
[-- Type: text/x-diff, Size: 1962 bytes --]

From ba19953a40bc5baf9127a2f3426fecc4ec8040ab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 22 Apr 2021 16:35:21 +0200
Subject: [PATCH] base-files: disable unprivileged eBPF by default.

eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.
---
 srcpkgs/base-files/files/bpf.conf    | 2 ++
 srcpkgs/base-files/files/sysctl.conf | 2 +-
 srcpkgs/base-files/template          | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/base-files/files/bpf.conf

diff --git a/srcpkgs/base-files/files/bpf.conf b/srcpkgs/base-files/files/bpf.conf
new file mode 100644
index 000000000000..faefda3b8d0e
--- /dev/null
+++ b/srcpkgs/base-files/files/bpf.conf
@@ -0,0 +1,2 @@
+# Block unprivileged use of eBPF
+kernel.unprivileged_bpf_disabled=1
diff --git a/srcpkgs/base-files/files/sysctl.conf b/srcpkgs/base-files/files/sysctl.conf
index 1e1a2768d677..c8e9eaec96be 100644
--- a/srcpkgs/base-files/files/sysctl.conf
+++ b/srcpkgs/base-files/files/sysctl.conf
@@ -2,7 +2,7 @@
 # User-alterable options are in 10-void-user.conf.
 
 # Append the PID to the core filename
-kernel.core_uses_pid = 1
+kernel.core_uses_pid=1
 
 # Enable hard and soft link protection
 fs.protected_hardlinks=1
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index ff629498408b..758cd54ad147 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.141
+version=0.142
 revision=11
 bootstrap=yes
 depends="xbps-triggers"
@@ -75,6 +75,7 @@ do_install() {
 	# sysctl(8) files
 	vinstall ${FILESDIR}/sysctl.conf 644 usr/lib/sysctl.d 10-void.conf
 	vinstall ${FILESDIR}/sysctl-user.conf 644 usr/lib/sysctl.d 10-void-user.conf
+	vinstall ${FILESDIR}/bpf.conf 644 usr/lib/sysctl.d 20-bpf.conf
 
 	# Install common licenses, from Debian.
 	vmkdir usr/share/licenses

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
                   ` (4 preceding siblings ...)
  2021-05-04 12:12 ` [PR PATCH] [Updated] " leahneukirchen
@ 2021-05-04 12:14 ` leahneukirchen
  2021-05-04 18:27 ` [PR PATCH] [Merged]: " leahneukirchen
  2021-05-05 15:21 ` Piraty
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-05-04 12:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-831895225

Comment:
Moved to custom file.

Please review @void-linux/pkg-committers.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
                   ` (5 preceding siblings ...)
  2021-05-04 12:14 ` leahneukirchen
@ 2021-05-04 18:27 ` leahneukirchen
  2021-05-05 15:21 ` Piraty
  7 siblings, 0 replies; 9+ messages in thread
From: leahneukirchen @ 2021-05-04 18:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1577 bytes --]

There's a merged pull request on the void-packages repository

base-files: disable unprivileged eBPF by default.
https://github.com/void-linux/void-packages/pull/30424

Description:
eBPF allowed a fair amount of local privilege escalation in
the past, disallow it for ordinary users by default.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: base-files: disable unprivileged eBPF by default.
  2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
                   ` (6 preceding siblings ...)
  2021-05-04 18:27 ` [PR PATCH] [Merged]: " leahneukirchen
@ 2021-05-05 15:21 ` Piraty
  7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2021-05-05 15:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/30424#issuecomment-832776948

Comment:
https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-05-05 15:21 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-22 14:40 [PR PATCH] base-files: disable unprivileged eBPF by default leahneukirchen
2021-04-22 14:47 ` leahneukirchen
2021-04-22 15:20 ` ericonr
2021-04-22 15:26 ` leahneukirchen
2021-04-22 16:00 ` ericonr
2021-05-04 12:12 ` [PR PATCH] [Updated] " leahneukirchen
2021-05-04 12:14 ` leahneukirchen
2021-05-04 18:27 ` [PR PATCH] [Merged]: " leahneukirchen
2021-05-05 15:21 ` Piraty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).