diff options
author | Tom Gundersen <teg@jklm.no> | 2013-10-29 17:38:31 +0100 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2013-10-29 17:56:09 +0100 |
commit | adf412b9ec7292e0c83aaf9ab93e08c2c8bd524a (patch) | |
tree | db6d6e2c4229a76494f99e96800d6ae35ff496b7 /src | |
parent | 98dd77e86e0cc339543cc8711ff908e6929f0636 (diff) |
rtnl: complain if used after fork
Diffstat (limited to 'src')
-rw-r--r-- | src/libsystemd-rtnl/rtnl-internal.h | 1 | ||||
-rw-r--r-- | src/libsystemd-rtnl/sd-rtnl.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/libsystemd-rtnl/rtnl-internal.h b/src/libsystemd-rtnl/rtnl-internal.h index f9c08e1a9a..c24d12b907 100644 --- a/src/libsystemd-rtnl/rtnl-internal.h +++ b/src/libsystemd-rtnl/rtnl-internal.h @@ -32,6 +32,7 @@ struct sd_rtnl { } sockaddr; unsigned serial; + pid_t original_pid; }; #define RTNL_DEFAULT_TIMEOUT ((usec_t) (10 * USEC_PER_SEC)) diff --git a/src/libsystemd-rtnl/sd-rtnl.c b/src/libsystemd-rtnl/sd-rtnl.c index b11a813dfe..9c1f40e48a 100644 --- a/src/libsystemd-rtnl/sd-rtnl.c +++ b/src/libsystemd-rtnl/sd-rtnl.c @@ -43,10 +43,21 @@ static int sd_rtnl_new(sd_rtnl **ret) { rtnl->sockaddr.nl.nl_family = AF_NETLINK; + rtnl->original_pid = getpid(); + *ret = rtnl; return 0; } +static bool rtnl_pid_changed(sd_rtnl *rtnl) { + assert(rtnl); + + /* We don't support people creating an rtnl connection and + * keeping it around over a fork(). Let's complain. */ + + return rtnl->original_pid != getpid(); +} + int sd_rtnl_open(uint32_t groups, sd_rtnl **ret) { _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL; int r; @@ -98,6 +109,7 @@ int sd_rtnl_send_with_reply_and_block(sd_rtnl *nl, int r, serial; assert_return(nl, -EINVAL); + assert_return(!rtnl_pid_changed(nl), -ECHILD); assert_return(message, -EINVAL); r = message_seal(nl, message); |