socket-default: Require CAP_NET_BIND_SERVICE for ports < 1024

Since we don't know which ports are used with socket-dynamic we can't
demand the capability there, but it might still be required.
This commit is contained in:
Tobias Brunner
2013-06-25 17:16:32 +02:00
parent 41b8546ac0
commit 1dd61bf13d
2 changed files with 16 additions and 1 deletions
@@ -692,6 +692,18 @@ socket_default_socket_t *socket_default_socket_create()
this->natt = 0;
}
if ((this->port && this->port < 1024) || (this->natt && this->natt < 1024))
{
if (!lib->caps->keep(lib->caps, CAP_NET_BIND_SERVICE))
{
/* required to bind ports < 1024 */
DBG1(DBG_NET, "socket-default plugin requires CAP_NET_BIND_SERVICE "
"capability");
destroy(this);
return NULL;
}
}
/* we allocate IPv6 sockets first as that will reserve randomly allocated
* ports also for IPv4. On OS X, we have to do it the other way round
* for the same effect. */
+4 -1
View File
@@ -32,8 +32,11 @@ typedef struct capabilities_t capabilities_t;
# include <linux/capability.h>
#endif
#ifndef CAP_NET_BIND_SERVICE
# define CAP_NET_BIND_SERVICE 10
#endif
#ifndef CAP_NET_ADMIN
#define CAP_NET_ADMIN 12
# define CAP_NET_ADMIN 12
#endif
/**