* [PR PATCH] cifs-utils: fix mounting with new libcap-ng
@ 2020-12-17 9:39 freshprince
2020-12-17 9:41 ` freshprince
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: freshprince @ 2020-12-17 9:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
There is a new pull request by freshprince against master on the void-packages repository
https://github.com/freshprince/void-packages cifs-util-caps
https://github.com/void-linux/void-packages/pull/27227
cifs-utils: fix mounting with new libcap-ng
This fixes the error "Unable to apply new capability set." when trying to mount cifs on an up-to-date system.
A patch file from https://github.com/void-linux/void-packages/pull/27227.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cifs-util-caps-27227.patch --]
[-- Type: text/x-diff, Size: 5268 bytes --]
From 2ceb83637f7dc90ebe3b69a85522885abd399255 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Thu, 17 Dec 2020 10:37:30 +0100
Subject: [PATCH] cifs-utils: fix mounting with new libcap-ng
---
.../patches/cifs.upall-setcap.patch | 51 +++++++++++++++++++
.../patches/mount.cifs-setcap.patch | 51 +++++++++++++++++++
srcpkgs/cifs-utils/template | 2 +-
3 files changed, 103 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
create mode 100644 srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
diff --git a/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch b/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
new file mode 100644
index 00000000000..376c8e1d512
--- /dev/null
+++ b/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
@@ -0,0 +1,51 @@
+From linux-cifs Sat Nov 21 11:11:45 2020
+From: Jonas Witschel <diabonas () archlinux ! org>
+Date: Sat, 21 Nov 2020 11:11:45 +0000
+To: linux-cifs
+Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when CAP_SETPCAP is given
+Message-Id: <20201121111145.24975-3-diabonas () archlinux ! org>
+X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021261
+
+libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
+of -4 when trying to update the capability bounding set without having the
+CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
+silently skipped updating the bounding set and only updated the normal
+CAPNG_SELECT_CAPS capabilities instead.
+
+Check beforehand whether we have CAP_SETPCAP, in which case we can use
+CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
+Otherwise, we can at least update the normal capabilities, but refrain from
+trying to update the bounding set to avoid getting an error.
+
+Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
+---
+ cifs.upcall.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/cifs.upcall.c b/cifs.upcall.c
+index 1559434..af1a0b0 100644
+--- cifs.upcall.c
++++ cifs.upcall.c
+@@ -88,6 +88,8 @@ typedef enum _sectype {
+ static int
+ trim_capabilities(bool need_environ)
+ {
++ capng_select_t set = CAPNG_SELECT_CAPS;
++
+ capng_clear(CAPNG_SELECT_BOTH);
+
+ /* SETUID and SETGID to change uid, gid, and grouplist */
+@@ -105,7 +107,10 @@ trim_capabilities(bool need_environ)
+ return 1;
+ }
+
+- if (capng_apply(CAPNG_SELECT_BOTH)) {
++ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
++ set = CAPNG_SELECT_BOTH;
++ }
++ if (capng_apply(set)) {
+ syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__);
+ return 1;
+ }
+--
+2.29.2
diff --git a/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch b/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
new file mode 100644
index 00000000000..74f17240469
--- /dev/null
+++ b/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
@@ -0,0 +1,51 @@
+From linux-cifs Sat Nov 21 11:11:44 2020
+From: Jonas Witschel <diabonas () archlinux ! org>
+Date: Sat, 21 Nov 2020 11:11:44 +0000
+To: linux-cifs
+Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when CAP_SETPCAP is given
+Message-Id: <20201121111145.24975-2-diabonas () archlinux ! org>
+X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021264
+
+libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error
+of -4 when trying to update the capability bounding set without having the
+CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng
+silently skipped updating the bounding set and only updated the normal
+CAPNG_SELECT_CAPS capabilities instead.
+
+Check beforehand whether we have CAP_SETPCAP, in which case we can use
+CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set.
+Otherwise, we can at least update the normal capabilities, but refrain from
+trying to update the bounding set to avoid getting an error.
+
+Signed-off-by: Jonas Witschel <diabonas@archlinux.org>
+---
+ mount.cifs.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index 4feb397..88b8b69 100644
+--- mount.cifs.c
++++ mount.cifs.c
+@@ -338,6 +338,8 @@ static int set_password(struct parsed_mount_info *parsed_info, const char *src)
+ static int
+ drop_capabilities(int parent)
+ {
++ capng_select_t set = CAPNG_SELECT_CAPS;
++
+ capng_setpid(getpid());
+ capng_clear(CAPNG_SELECT_BOTH);
+ if (parent) {
+@@ -355,7 +357,10 @@ drop_capabilities(int parent)
+ return EX_SYSERR;
+ }
+ }
+- if (capng_apply(CAPNG_SELECT_BOTH)) {
++ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) {
++ set = CAPNG_SELECT_BOTH;
++ }
++ if (capng_apply(set)) {
+ fprintf(stderr, "Unable to apply new capability set.\n");
+ return EX_SYSERR;
+ }
+--
+2.29.2
diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template
index 6ca4f30db5d..6a2340931bc 100644
--- a/srcpkgs/cifs-utils/template
+++ b/srcpkgs/cifs-utils/template
@@ -1,7 +1,7 @@
# Template file for 'cifs-utils'
pkgname=cifs-utils
version=6.11
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-systemd"
make_install_args="ROOTSBINDIR=/usr/bin"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: cifs-utils: fix mounting with new libcap-ng
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
@ 2020-12-17 9:41 ` freshprince
2020-12-17 10:49 ` lane-brain
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: freshprince @ 2020-12-17 9:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/27227#issuecomment-747328016
Comment:
#27219 only applies half of the patches
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: cifs-utils: fix mounting with new libcap-ng
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
2020-12-17 9:41 ` freshprince
@ 2020-12-17 10:49 ` lane-brain
2020-12-17 10:51 ` freshprince
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: lane-brain @ 2020-12-17 10:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by lane-brain on void-packages repository
https://github.com/void-linux/void-packages/pull/27227#issuecomment-747363772
Comment:
thanks for catching this
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: cifs-utils: fix mounting with new libcap-ng
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
2020-12-17 9:41 ` freshprince
2020-12-17 10:49 ` lane-brain
@ 2020-12-17 10:51 ` freshprince
2020-12-17 13:48 ` [PR PATCH] [Merged]: " ericonr
2020-12-17 13:48 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: freshprince @ 2020-12-17 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by freshprince on void-packages repository
https://github.com/void-linux/void-packages/pull/27227#issuecomment-747364728
Comment:
i only found your pr after i prepared mine. otherwise i would have just asked you to add the other patch too. sorry for that.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: cifs-utils: fix mounting with new libcap-ng
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
` (2 preceding siblings ...)
2020-12-17 10:51 ` freshprince
@ 2020-12-17 13:48 ` ericonr
2020-12-17 13:48 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-17 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
There's a merged pull request on the void-packages repository
cifs-utils: fix mounting with new libcap-ng
https://github.com/void-linux/void-packages/pull/27227
Description:
This fixes the error "Unable to apply new capability set." when trying to mount cifs on an up-to-date system.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: cifs-utils: fix mounting with new libcap-ng
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
` (3 preceding siblings ...)
2020-12-17 13:48 ` [PR PATCH] [Merged]: " ericonr
@ 2020-12-17 13:48 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-17 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27227#issuecomment-747449152
Comment:
Thank you!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-17 13:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-17 9:39 [PR PATCH] cifs-utils: fix mounting with new libcap-ng freshprince
2020-12-17 9:41 ` freshprince
2020-12-17 10:49 ` lane-brain
2020-12-17 10:51 ` freshprince
2020-12-17 13:48 ` [PR PATCH] [Merged]: " ericonr
2020-12-17 13:48 ` ericonr
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).