virtiofsd capability changes and addition
v2 cover virtiofsd capability changes and addition
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This is a set of changes relating to the capability restirctions
introduced in virtiofsd back in a59feb483b8.
The first one is a potentially important fix; the missing terminator could mean extra capabilities are added based on junk on the stack; although that's not been seen in practice.
v2
Pass a copy of the parameter list into setup_capabilities
Dr. David Alan Gilbert (3):
virtiofsd: Terminate capability list
virtiofsd: Check capability calls
virtiofsd: Allow addition or removal of capabilities
docs/tools/virtiofsd.rst | 5 +++ tools/virtiofsd/helper.c | 2 + tools/virtiofsd/passthrough_ll.c | 71 +++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 5 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/3 virtiofsd: Terminate capability list
From: "Dr. David Alan Gilbert" <[email protected]>
capng_updatev is a varargs function that needs a -1 to terminate it, but it was missing.
In practice what seems to have been happening is that it's added the capabilities we asked for, then runs into junk on the stack, so if we're unlucky it might be adding some more, but in reality it's failing - but after adding the capabilities we asked for.
--- tools/virtiofsd/passthrough_ll.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/virtiofsd/passthrough_ll.c +3 -1
@@ -2598,7 +2598,9 @@ static void setup_capabilities(void)CAP_SETGID ,CAP_SETUID ,CAP_MKNOD , - CAP_SETFCAP); +CAP_SETFCAP , + -1); +capng_apply (CAPNG_SELECT_BOTH ); cap.saved =capng_save_state ();
Signature · 1 line
2.26.2
PATCH v2 2/3 virtiofsd: Check capability calls
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Check the capability calls worked.
--- tools/virtiofsd/passthrough_ll.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
tools/virtiofsd/passthrough_ll.c +13 -3
@@ -2589,7 +2589,7 @@ static void setup_capabilities(void)*/ capng_setpid (syscall (SYS_gettid));capng_clear (CAPNG_SELECT_BOTH ); - capng_updatev(CAPNG_ADD, CAPNG_PERMITTED | CAPNG_EFFECTIVE, + if (capng_updatev(CAPNG_ADD, CAPNG_PERMITTED | CAPNG_EFFECTIVE, CAP_CHOWN, CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
@@ -2599,11 +2599,21 @@ static void setup_capabilities(void) CAP_SETUID, CAP_MKNOD, CAP_SETFCAP, - -1); + -1)) { +fuse_log (FUSE_LOG_ERR ,"%s: capng_updatev failed\n" , __func__); +exit (1 ); + } -capng_apply (CAPNG_SELECT_BOTH ); +if (capng_apply (CAPNG_SELECT_BOTH )) { +fuse_log (FUSE_LOG_ERR ,"%s: capng_apply failed\n" , __func__); +exit (1 ); + } cap.saved =capng_save_state (); +if (!cap.saved) { +fuse_log (FUSE_LOG_ERR ,"%s: capng_save_state failed\n" , __func__); +exit (1 ); + }pthread_mutex_unlock (&cap.mutex); }
Signature · 1 line
2.26.2
PATCH v2 3/3 virtiofsd: Allow addition or removal of capabilities
In reply to Dr. David Alan Gilbert (git)From: "Dr. David Alan Gilbert" <[email protected]>
Allow capabilities to be added or removed from the allowed set for the daemon; e.g.
default:
CapPrm: 00000000880000df
CapEff: 00000000880000df
-o modcaps=+sys_admin
CapPrm: 00000000882000df
CapEff: 00000000882000df
-o modcaps=+sys_admin:-chown
CapPrm: 00000000882000de
CapEff: 00000000882000de
--- docs/tools/virtiofsd.rst | 5 +++ tools/virtiofsd/helper.c | 2 ++ tools/virtiofsd/passthrough_ll.c | 53 ++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 2 deletions(-)
docs/tools/virtiofsd.rst +5 -0
@@ -54,6 +54,11 @@ Options * flock|no_flock - Enable/disable flock. The default is ``no_flock``. + * modcaps=CAPLIST + Modify the list of capabilities allowed; CAPLIST is a colon separated + list of capabilities, each preceded by either + or -, e.g. + ''+sys_admin:-chown''. + * log_level=LEVEL - Print only log messages matching LEVEL or more severe. LEVEL is one of ``err``, ``warn``, ``info``, or ``debug``. The default is ``info``.
tools/virtiofsd/helper.c +2 -0
@@ -174,6 +174,8 @@ void fuse_cmdline_help(void)" default: no_writeback\n" " -o xattr|no_xattr enable/disable xattr\n" " default: no_xattr\n" +" -o modcaps=CAPLIST Modify the list of capabilities\n" +" e.g. -o modcaps=+sys_admin:-chown\n" " --rlimit-nofile=<num> set maximum number of file descriptors\n" " (0 leaves rlimit unchanged)\n" " default: min(1000000, fs.file-max - 16384)\n"
tools/virtiofsd/passthrough_ll.c +51 -2
85 lines not on this page · raw message
Signature · 1 line
2.26.2
Quoted 6 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This is a set of changes relating to the capability restirctions
introduced in virtiofsd back ina59feb483b8.
Quoted 6 lines
The first one is a potentially important fix; the missing terminator could mean extra capabilities are added based on junk on the stack; although that's not been seen in practice.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Mounting overlayfs on top of virtiofs now works for me once I gave CAP_SYS_ADMIN to daemon.
Thanks
Vivek
Quoted 16 lines
v2
Pass a copy of the parameter list intosetup_capabilitiesDr. David Alan Gilbert (3):
virtiofsd: Terminate capability list
virtiofsd: Check capability calls
virtiofsd: Allow addition or removal of capabilitiesdocs/tools/virtiofsd.rst | 5 +++ tools/virtiofsd/helper.c | 2 + tools/virtiofsd/passthrough_ll.c | 71 +++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 5 deletions(-)Signature · 1 line
2.26.2
Quoted 20 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This is a set of changes relating to the capability restirctions
introduced in virtiofsd back ina59feb483b8.The first one is a potentially important fix; the missing terminator could mean extra capabilities are added based on junk on the stack; although that's not been seen in practice.
Signed-off-by Dr. David Alan Gilbert <[email protected]>v2
Pass a copy of the parameter list intosetup_capabilitiesDr. David Alan Gilbert (3):
virtiofsd: Terminate capability list
virtiofsd: Check capability calls
virtiofsd: Allow addition or removal of capabilities
Quoted 8 lines
docs/tools/virtiofsd.rst | 5 +++ tools/virtiofsd/helper.c | 2 + tools/virtiofsd/passthrough_ll.c | 71 +++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 5 deletions(-)Signature · 1 line
2.26.2
Quoted 11 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
Hi,
This is a set of changes relating to the capability restirctions
introduced in virtiofsd back ina59feb483b8.The first one is a potentially important fix; the missing terminator could mean extra capabilities are added based on junk on the stack; although that's not been seen in practice.
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Queued
Quoted 9 lines
v2
Pass a copy of the parameter list intosetup_capabilitiesDr. David Alan Gilbert (3):
virtiofsd: Terminate capability list
virtiofsd: Check capability calls
virtiofsd: Allow addition or removal of capabilities
Quoted 9 lines
docs/tools/virtiofsd.rst | 5 +++ tools/virtiofsd/helper.c | 2 + tools/virtiofsd/passthrough_ll.c | 71 +++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 5 deletions(-)Signature · 1 line
2.26.2
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK