This allows us to run networkd mostly unpriviliged with the exception of
CAP_NET_* and CAP_SYS_MODULE. I'd really like to get rid of the latter
though...
systemd_networkd_LDADD = \
libsystemd-networkd-core.la \
systemd_networkd_LDADD = \
libsystemd-networkd-core.la \
+ libsystemd-capability.la \
$(KMOD_LIBS)
noinst_LTLIBRARIES += \
$(KMOD_LIBS)
noinst_LTLIBRARIES += \
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "sd-event.h"
#include "sd-daemon.h"
#include "sd-event.h"
#include "sd-daemon.h"
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
int main(int argc, char *argv[]) {
_cleanup_manager_free_ Manager *m = NULL;
+ const char *user = "systemd-network";
+ uid_t uid;
+ gid_t gid;
int r;
log_set_target(LOG_TARGET_AUTO);
int r;
log_set_target(LOG_TARGET_AUTO);
+ r = get_user_creds(&user, &uid, &gid, NULL, NULL);
+ if (r < 0) {
+ log_error("Cannot resolve user name %s: %s", user, strerror(-r));
+ goto out;
+ }
+
/* Always create the directories people can create inotify
* watches in. */
/* Always create the directories people can create inotify
* watches in. */
- r = mkdir_label("/run/systemd/network", 0755);
+ r = mkdir_safe_label("/run/systemd/network", 0755, uid, gid);
if (r < 0)
log_error("Could not create runtime directory: %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory: %s",
strerror(-r));
- r = mkdir_label("/run/systemd/network/links", 0755);
+ r = mkdir_safe_label("/run/systemd/network/links", 0755, uid, gid);
if (r < 0)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'links': %s",
strerror(-r));
- r = mkdir_label("/run/systemd/network/leases", 0755);
+ r = mkdir_safe_label("/run/systemd/network/leases", 0755, uid, gid);
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
if (r < 0)
log_error("Could not create runtime directory 'leases': %s",
strerror(-r));
+ r = drop_privileges(uid, gid,
+ (1ULL << CAP_NET_ADMIN) |
+ (1ULL << CAP_NET_BIND_SERVICE) |
+ (1ULL << CAP_NET_BROADCAST) |
+ (1ULL << CAP_NET_RAW) |
+ (1ULL << CAP_SYS_MODULE));
+ if (r < 0)
+ goto out;
+
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
r = manager_new(&m);
if (r < 0) {
log_error("Could not create manager: %s", strerror(-r));
Restart=always
RestartSec=0
ExecStart=@rootlibexecdir@/systemd-networkd
Restart=always
RestartSec=0
ExecStart=@rootlibexecdir@/systemd-networkd
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_MODULE
+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_MODULE CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER
WatchdogSec=1min
[Install]
WatchdogSec=1min
[Install]