zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed capability support and corrected typos

Browse source
This commit is contained in:
namnamc 2015-11-03 17:48:10 -08:00
commit de0a6e5452
1 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/sandbox.c
View file

@ -42,7 +42,7 @@
#include "sandbox.h" #include "sandbox.h"
#define IRSSI_NEEDS_RDTSC #define IRSSI_NEEDS_RDTSC
#define IRSSI_NEEDS_CAPS #undef IRSSI_NEEDS_CAPS
/* /*
* TODO: * TODO:
@ -53,6 +53,14 @@
* - add support tame() on OpenBSD, and Capsicum on FreeBSD * - add support tame() on OpenBSD, and Capsicum on FreeBSD
*/ */
struct _cap_struct {
struct __user_cap_header_struct head;
union {
struct __user_cap_data_struct set;
uint32_t flag[3];
} u[2];
};
void create_namespaces(void) void create_namespaces(void)
{ {
/* TODO */ /* TODO */
@ -62,6 +70,7 @@ void drop_privileges(void)
{ {
int tsc_state; int tsc_state;
size_t i; size_t i;
uint32_t *raw_data;
cap_t cap; cap_t cap;
cap_flag_value_t value; cap_flag_value_t value;
@ -91,13 +100,21 @@ void drop_privileges(void)
/* drop any dangerous capabilities the process is running with /* drop any dangerous capabilities the process is running with
* https://forums.grsecurity.net/viewtopic.php?f=7&t=2522 */ * https://forums.grsecurity.net/viewtopic.php?f=7&t=2522 */
/* FIXME why does cap_get_proc() fail? */
#ifndef IRSSI_NEEDS_CAPS #ifndef IRSSI_NEEDS_CAPS
cap = cap_get_proc(); cap = cap_get_proc();
if (cap == NULL) { if (cap == NULL) {
fprintf(stderr, "Could not initialize capabilities (cap_get_proc failed)\n"); raw_data = malloc(sizeof(uint32_t) + sizeof(*cap));
*raw_data = 0xCA90D0; /* CAP_T_MAGIC */
cap = (cap_t)(raw_data + 1);
memset(cap, 0, sizeof(*cap));
cap->header.version = 0x20080522; /* capability version 3 */
if (capget(&cap->head, &cap->u[0].set) < 0) {
cap_free(cap);
fprintf(stderr, "Could not initialize capabilities (capget failed)\n");
exit(1); exit(1);
} }
}
if (cap_clear(cap) < 0) { if (cap_clear(cap) < 0) {
fprintf(stderr, "Could not clear capabilities (cap_clear failed)\n"); fprintf(stderr, "Could not clear capabilities (cap_clear failed)\n");
@ -283,7 +300,7 @@ void enable_seccomp_sandbox(void)
}; };
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt), 3, rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getsockopt), 3,
SCMP_A0(SCMP_CMP_EQ, getsockopt_struct[i].minsockfd), SCMP_A0(SCMP_CMP_GE, getsockopt_struct[i].minsockfd),
SCMP_A1(SCMP_CMP_EQ, getsockopt_struct[i].level), SCMP_A1(SCMP_CMP_EQ, getsockopt_struct[i].level),
SCMP_A2(SCMP_CMP_EQ, getsockopt_struct[i].optname)); SCMP_A2(SCMP_CMP_EQ, getsockopt_struct[i].optname));
if (rc < 0) if (rc < 0)
@ -413,7 +430,7 @@ void enable_seccomp_sandbox(void)
rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4, rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4,
SCMP_A2(SCMP_CMP_EQ, mmap_anon_struct[i].prot), SCMP_A2(SCMP_CMP_EQ, mmap_anon_struct[i].prot),
SCMP_A3(SCMP_CMP_EQ, mmap_anon_struct[i].flags), SCMP_A3(SCMP_CMP_EQ, mmap_anon_struct[i].flags),
SCMP_A4(SCMP_CMP_EQ, 0xffffffff), SCMP_A4(SCMP_CMP_EQ, (unsigned)-1),
SCMP_A5(SCMP_CMP_EQ, 0)); SCMP_A5(SCMP_CMP_EQ, 0));
if (rc < 0) if (rc < 0)
goto fail; goto fail;
@ -428,7 +445,7 @@ void enable_seccomp_sandbox(void)
rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4, rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4,
SCMP_A2(SCMP_CMP_EQ, mmap_noanon_struct[i].prot), SCMP_A2(SCMP_CMP_EQ, mmap_noanon_struct[i].prot),
SCMP_A3(SCMP_CMP_EQ, mmap_noanon_struct[i].flags), SCMP_A3(SCMP_CMP_EQ, mmap_noanon_struct[i].flags),
SCMP_A4(SCMP_CMP_NE, 0xffffffff), SCMP_A4(SCMP_CMP_NE, (unsigned)-1),
SCMP_A5(SCMP_CMP_EQ, 0)); SCMP_A5(SCMP_CMP_EQ, 0));
if (rc < 0) if (rc < 0)
goto fail; goto fail;
@ -437,7 +454,7 @@ void enable_seccomp_sandbox(void)
rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4, rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(mmap), 4,
SCMP_A2(SCMP_CMP_EQ, PROT_READ|PROT_WRITE), SCMP_A2(SCMP_CMP_EQ, PROT_READ|PROT_WRITE),
SCMP_A3(SCMP_CMP_EQ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE), SCMP_A3(SCMP_CMP_EQ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE),
SCMP_A4(SCMP_CMP_NE, 0xffffffff), SCMP_A4(SCMP_CMP_NE, (unsigned)-1),
SCMP_A5(SCMP_CMP_NE, 0)); /* NE 0, so can't be in the struct */ SCMP_A5(SCMP_CMP_NE, 0)); /* NE 0, so can't be in the struct */
if (rc < 0) if (rc < 0)
goto fail; goto fail;