diff options
| author | Jeff Layton <jlayton@samba.org> | 2017-02-16 09:55:45 -0500 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2017-02-16 09:55:45 -0500 |
| commit | ec3874fdc669901f4a9e8a90a856f999cd627a3f (patch) | |
| tree | d69955f93e8185f7d075257f99781b8c037354ea | |
| parent | ed97e4ecab4e9a103c46232785fb76b3f07d0637 (diff) | |
| download | cifs-utils-ec3874fdc669901f4a9e8a90a856f999cd627a3f.tar.gz cifs-utils-ec3874fdc669901f4a9e8a90a856f999cd627a3f.tar.bz2 cifs-utils-ec3874fdc669901f4a9e8a90a856f999cd627a3f.zip | |
cifs.upcall: trim even more capabilities
We really only need CAP_DAC_READ_SEARCH, not CAP_DAC_OVERRIDE, and
only when we are going to probe the environ file.
Also, fix the non-libcap-ng trim_capabilities prototype.
Reviewed-by: Simo Sorce <simo@redhat.com>
Signed-off-by: Jeff Layton <jlayton@samba.org>
| -rw-r--r-- | cifs.upcall.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cifs.upcall.c b/cifs.upcall.c index 6d9c427..f766a8b 100644 --- a/cifs.upcall.c +++ b/cifs.upcall.c @@ -70,22 +70,21 @@ typedef enum _sectype { #ifdef HAVE_LIBCAP_NG static int -trim_capabilities(bool need_ptrace) +trim_capabilities(bool need_environ) { capng_clear(CAPNG_SELECT_BOTH); - /* - * Need PTRACE and DAC_OVERRIDE for environment scraping, SETGID to - * change gid and grouplist, and SETUID to change uid. - */ + /* SETUID and SETGID to change uid, gid, and grouplist */ if (capng_updatev(CAPNG_ADD, CAPNG_PERMITTED|CAPNG_EFFECTIVE, - CAP_SETUID, CAP_SETGID, CAP_DAC_OVERRIDE, -1)) { + CAP_SETUID, CAP_SETGID, -1)) { syslog(LOG_ERR, "%s: Unable to update capability set: %m\n", __func__); return 1; } - if (need_ptrace && - capng_update(CAPNG_ADD, CAPNG_PERMITTED|CAPNG_EFFECTIVE, CAP_SYS_PTRACE)) { + /* Need PTRACE and READ_SEARCH for /proc/pid/environ scraping */ + if (need_environ && + capng_updatev(CAPNG_ADD, CAPNG_PERMITTED|CAPNG_EFFECTIVE, + CAP_SYS_PTRACE, CAP_DAC_READ_SEARCH, -1)) { syslog(LOG_ERR, "%s: Unable to update capability set: %m\n", __func__); return 1; } @@ -109,7 +108,7 @@ drop_all_capabilities(void) } #else /* HAVE_LIBCAP_NG */ static int -trim_capabilities(void) +trim_capabilities(bool unused) { return 0; } |